[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4ADC1BAE.9060508@gmail.com>
Date: Mon, 19 Oct 2009 15:56:30 +0800
From: Changli Gao <xiaosuo@...il.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
xiaosuo <xiaosuo@...il.com>
Subject: PATCH: sendfile() checks f_op.sendpage() instead of f_op.splice_write()
wrongly
sendfile(2) checks f_op.sendpage() instead of f_op.splice_write() wrongly.
sendfile(2) was reworked with the splice infrastructure, but it still
checks f_op.sendpage() instead of f_op.splice_write() wrongly. Although
if f_op.sendpage() exists, f_op.splice_write() always exists at the same
time currently, the assumption will be broken in future silently. This
patch also brings a side effect: sendfile(2) can work with any output
file, which supports splice_write() not only mmap(2).
Signed-off-by: Changli Gao <xiaosuo@...il.com>
----
fs/read_write.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -826,7 +826,7 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
if (!(out_file->f_mode & FMODE_WRITE))
goto fput_out;
retval = -EINVAL;
- if (!out_file->f_op || !out_file->f_op->sendpage)
+ if (!out_file->f_op || !out_file->f_op->splice_write)
goto fput_out;
in_inode = in_file->f_path.dentry->d_inode;
out_inode = out_file->f_path.dentry->d_inode;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists