aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-06-04 09:03:12 -0400
committerJens Axboe <jens.axboe@oracle.com>2007-06-08 02:33:53 -0400
commit17374ff1aa9ce2a0597416a16729474b538af443 (patch)
tree1bf80da7467887d02d610832600edd8f2732850f /include/linux
parent267adc3e66c3d3c2edb89dac9eddc20ac94d646b (diff)
pipe: move pipe_inode_info structure decleration up before it's used
There's really no reason it's below the first use of the pointer type, and it'll fail compilation for the network addition (for good reason). So move it up a bit. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pipe_fs_i.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 8bcbc54e1b48..c8884f971228 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -16,6 +16,21 @@ struct pipe_buffer {
16 unsigned int flags; 16 unsigned int flags;
17}; 17};
18 18
19struct pipe_inode_info {
20 wait_queue_head_t wait;
21 unsigned int nrbufs, curbuf;
22 struct page *tmp_page;
23 unsigned int readers;
24 unsigned int writers;
25 unsigned int waiting_writers;
26 unsigned int r_counter;
27 unsigned int w_counter;
28 struct fasync_struct *fasync_readers;
29 struct fasync_struct *fasync_writers;
30 struct inode *inode;
31 struct pipe_buffer bufs[PIPE_BUFFERS];
32};
33
19/* 34/*
20 * Note on the nesting of these functions: 35 * Note on the nesting of these functions:
21 * 36 *
@@ -38,21 +53,6 @@ struct pipe_buf_operations {
38 void (*get)(struct pipe_inode_info *, struct pipe_buffer *); 53 void (*get)(struct pipe_inode_info *, struct pipe_buffer *);
39}; 54};
40 55
41struct pipe_inode_info {
42 wait_queue_head_t wait;
43 unsigned int nrbufs, curbuf;
44 struct page *tmp_page;
45 unsigned int readers;
46 unsigned int writers;
47 unsigned int waiting_writers;
48 unsigned int r_counter;
49 unsigned int w_counter;
50 struct fasync_struct *fasync_readers;
51 struct fasync_struct *fasync_writers;
52 struct inode *inode;
53 struct pipe_buffer bufs[PIPE_BUFFERS];
54};
55
56/* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual 56/* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual
57 memory allocation, whereas PIPE_BUF makes atomicity guarantees. */ 57 memory allocation, whereas PIPE_BUF makes atomicity guarantees. */
58#define PIPE_SIZE PAGE_SIZE 58#define PIPE_SIZE PAGE_SIZE