diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 09:02:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 09:02:07 -0700 |
| commit | 9ca686626c012935b3b8219815e9027facc6fe6e (patch) | |
| tree | 632364c2feb6b4c08d83d3014e771dee55f1e4c1 /fs/xfs/linux-2.6/xfs_lrw.h | |
| parent | e57a5059846e55d82b86d96dde40e988598601b3 (diff) | |
| parent | 70524490ee2ea1bbf6cee6c106597b3ac25a3fc2 (diff) | |
Merge branch 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] splice: add support for sys_tee()
[PATCH] splice: pass offset around for ->splice_read() and ->splice_write()
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_lrw.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.h b/fs/xfs/linux-2.6/xfs_lrw.h index 55c689a86ad..8f453995235 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.h +++ b/fs/xfs/linux-2.6/xfs_lrw.h @@ -93,11 +93,11 @@ extern ssize_t xfs_write(struct bhv_desc *, struct kiocb *, extern ssize_t xfs_sendfile(struct bhv_desc *, struct file *, loff_t *, int, size_t, read_actor_t, void *, struct cred *); -extern ssize_t xfs_splice_read(struct bhv_desc *, struct file *, +extern ssize_t xfs_splice_read(struct bhv_desc *, struct file *, loff_t *, struct pipe_inode_info *, size_t, int, int, struct cred *); extern ssize_t xfs_splice_write(struct bhv_desc *, struct pipe_inode_info *, - struct file *, size_t, int, int, + struct file *, loff_t *, size_t, int, int, struct cred *); #endif /* __XFS_LRW_H__ */ |