diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-31 15:43:35 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-31 15:43:35 +0000 |
| commit | f1682e94a38b66ee2551f3a5e4b36259a561c411 (patch) | |
| tree | 1d1f8b105735db6707a1726ec99c93cdb98392dc /fs | |
| parent | 6910ab30a29d10e0fec7710b2ed857a2201e2468 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
| download | linux-3.10-f1682e94a38b66ee2551f3a5e4b36259a561c411.tar.gz linux-3.10-f1682e94a38b66ee2551f3a5e4b36259a561c411.tar.bz2 linux-3.10-f1682e94a38b66ee2551f3a5e4b36259a561c411.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/splice.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/splice.c b/fs/splice.c index 4a026f95884..7c2bbf18d7a 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -22,6 +22,7 @@ #include <linux/pipe_fs_i.h> #include <linux/mm_inline.h> #include <linux/swap.h> +#include <linux/module.h> /* * Passed to the actors @@ -567,6 +568,9 @@ ssize_t generic_splice_sendpage(struct inode *inode, struct file *out, return move_from_pipe(inode, out, len, flags, pipe_to_sendpage); } +EXPORT_SYMBOL(generic_file_splice_write); +EXPORT_SYMBOL(generic_file_splice_read); + static long do_splice_from(struct inode *pipe, struct file *out, size_t len, unsigned int flags) { |