aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pipe_fs_i.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index b8aae1fc5185..4c054491e38e 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -5,7 +5,8 @@
5 5
6#define PIPE_BUFFERS (16) 6#define PIPE_BUFFERS (16)
7 7
8#define PIPE_BUF_FLAG_LRU 0x01 8#define PIPE_BUF_FLAG_LRU 0x01 /* page is on the LRU */
9#define PIPE_BUF_FLAG_ATOMIC 0x02 /* was atomically mapped */
9 10
10struct pipe_buffer { 11struct pipe_buffer {
11 struct page *page; 12 struct page *page;
@@ -28,8 +29,8 @@ struct pipe_buffer {
28 */ 29 */
29struct pipe_buf_operations { 30struct pipe_buf_operations {
30 int can_merge; 31 int can_merge;
31 void * (*map)(struct pipe_inode_info *, struct pipe_buffer *); 32 void * (*map)(struct pipe_inode_info *, struct pipe_buffer *, int);
32 void (*unmap)(struct pipe_inode_info *, struct pipe_buffer *); 33 void (*unmap)(struct pipe_inode_info *, struct pipe_buffer *, void *);
33 int (*pin)(struct pipe_inode_info *, struct pipe_buffer *); 34 int (*pin)(struct pipe_inode_info *, struct pipe_buffer *);
34 void (*release)(struct pipe_inode_info *, struct pipe_buffer *); 35 void (*release)(struct pipe_inode_info *, struct pipe_buffer *);
35 int (*steal)(struct pipe_inode_info *, struct pipe_buffer *); 36 int (*steal)(struct pipe_inode_info *, struct pipe_buffer *);
@@ -64,8 +65,8 @@ void free_pipe_info(struct inode * inode);
64void __free_pipe_info(struct pipe_inode_info *); 65void __free_pipe_info(struct pipe_inode_info *);
65 66
66/* Generic pipe buffer ops functions */ 67/* Generic pipe buffer ops functions */
67void *generic_pipe_buf_map(struct pipe_inode_info *, struct pipe_buffer *); 68void *generic_pipe_buf_map(struct pipe_inode_info *, struct pipe_buffer *, int);
68void generic_pipe_buf_unmap(struct pipe_inode_info *, struct pipe_buffer *); 69void generic_pipe_buf_unmap(struct pipe_inode_info *, struct pipe_buffer *, void *);
69void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *); 70void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *);
70int generic_pipe_buf_pin(struct pipe_inode_info *, struct pipe_buffer *); 71int generic_pipe_buf_pin(struct pipe_inode_info *, struct pipe_buffer *);
71 72