diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-11 11:31:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-11 11:31:05 -0700 |
| commit | 5212c555be332fc95982077e6cdc7bb6cb5fff5f (patch) | |
| tree | 44907e3427949462dcc54ae762cc49ae8e9571f0 /include | |
| parent | 845a2fdcbd5bc5b9f652201ee95c825827a1d521 (diff) | |
| parent | 620a324b744a7d66c3c45a83042f8e7fc9fc5a04 (diff) | |
Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block
* 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block:
splice: __generic_file_splice_read: fix read/truncate race
splice: __generic_file_splice_read: fix i_size_read() length checks
splice: move balance_dirty_pages_ratelimited() outside of splice actor
pipe: move pipe_inode_info structure decleration up before it's used
splice: remove do_splice_direct() symbol export
splice: move inode size check into generic_file_splice_read()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pipe_fs_i.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index 8bcbc54e1b4..c8884f97122 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -16,6 +16,21 @@ struct pipe_buffer { unsigned int flags; }; +struct pipe_inode_info { + wait_queue_head_t wait; + unsigned int nrbufs, curbuf; + struct page *tmp_page; + unsigned int readers; + unsigned int writers; + unsigned int waiting_writers; + unsigned int r_counter; + unsigned int w_counter; + struct fasync_struct *fasync_readers; + struct fasync_struct *fasync_writers; + struct inode *inode; + struct pipe_buffer bufs[PIPE_BUFFERS]; +}; + /* * Note on the nesting of these functions: * @@ -38,21 +53,6 @@ struct pipe_buf_operations { void (*get)(struct pipe_inode_info *, struct pipe_buffer *); }; -struct pipe_inode_info { - wait_queue_head_t wait; - unsigned int nrbufs, curbuf; - struct page *tmp_page; - unsigned int readers; - unsigned int writers; - unsigned int waiting_writers; - unsigned int r_counter; - unsigned int w_counter; - struct fasync_struct *fasync_readers; - struct fasync_struct *fasync_writers; - struct inode *inode; - struct pipe_buffer bufs[PIPE_BUFFERS]; -}; - /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual memory allocation, whereas PIPE_BUF makes atomicity guarantees. */ #define PIPE_SIZE PAGE_SIZE |