Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git (f1682e94) · Commits · e / devices / android_kernel_teracube_2e

fs/splice.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{