dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git 

Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French 2006-03-31 15:43:35 +00:00
parent 6910ab30a2 a0f0678025
commit f1682e94a3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/splice.c
View File

@ -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)
{