diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 18:05:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 18:05:49 +0200 |
| commit | e0ab0bb6d2b77917f4c31f157b2690602a5608f9 (patch) | |
| tree | 644c65b44f551e29341d5efab6b309ff1e6782f2 /include | |
| parent | [PATCH] Fix kernel build with EMBEDDED & PROC_FS & !PROC_SYSCTL (diff) | |
| parent | Export __splice_from_pipe() (diff) | |
| download | linux-e0ab0bb6d2b77917f4c31f157b2690602a5608f9.tar.xz linux-e0ab0bb6d2b77917f4c31f157b2690602a5608f9.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
Export __splice_from_pipe()
2/2 splice: dont readpage
1/2 splice: dont steal
make elv_register() output atomic
block: blk_max_pfn is somtimes wrong
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pipe_fs_i.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index 2e19478e9e84..8bcbc54e1b48 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -99,4 +99,8 @@ extern ssize_t splice_from_pipe(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int, splice_actor *); +extern ssize_t __splice_from_pipe(struct pipe_inode_info *, struct file *, + loff_t *, size_t, unsigned int, + splice_actor *); + #endif |