aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 13:25:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-04 13:25:40 -0400
commitcbdf811c77cf2906a099b8da92e9f6f335b68a73 (patch)
treec4f96893936eddb31c60476ea4e776499d9046df /include
parent936ef1d48ac9a9fc90746bacd93624969711775a (diff)
parent98232d504db0a1f91ecaa93686ed3bf61963103b (diff)
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST [PATCH] splice: rename remaining info variables to pipe [PATCH] splice: LRU fixups [PATCH] splice: fix unlocking of page on error ->prepare_write()
Diffstat (limited to 'include')
-rw-r--r--include/linux/pipe_fs_i.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ba73108cbf8..ea4f7cd7bfd 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -5,8 +5,9 @@
#define PIPE_BUFFERS (16)
-#define PIPE_BUF_FLAG_ATOMIC 0x01 /* was atomically mapped */
-#define PIPE_BUF_FLAG_GIFT 0x02 /* page is a gift */
+#define PIPE_BUF_FLAG_LRU 0x01 /* page is on the LRU */
+#define PIPE_BUF_FLAG_ATOMIC 0x02 /* was atomically mapped */
+#define PIPE_BUF_FLAG_GIFT 0x04 /* page is a gift */
struct pipe_buffer {
struct page *page;