git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
pipe_fs_i.h
diff --git
a/include/linux/pipe_fs_i.h
b/include/linux/pipe_fs_i.h
index
ea4f7cd
..
2e19478
100644
(file)
--- a/
include/linux/pipe_fs_i.h
+++ b/
include/linux/pipe_fs_i.h
@@
-12,7
+12,7
@@
struct pipe_buffer {
struct page *page;
unsigned int offset, len;
struct pipe_buffer {
struct page *page;
unsigned int offset, len;
- struct pipe_buf_operations *ops;
+
const
struct pipe_buf_operations *ops;
unsigned int flags;
};
unsigned int flags;
};
@@
-41,9
+41,7
@@
struct pipe_buf_operations {
struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
- struct pipe_buffer bufs[PIPE_BUFFERS];
struct page *tmp_page;
struct page *tmp_page;
- unsigned int start;
unsigned int readers;
unsigned int writers;
unsigned int waiting_writers;
unsigned int readers;
unsigned int writers;
unsigned int waiting_writers;
@@
-52,6
+50,7
@@
struct pipe_inode_info {
struct fasync_struct *fasync_readers;
struct fasync_struct *fasync_writers;
struct inode *inode;
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
};
/* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual