summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-11-11 02:32:13 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2016-11-11 02:32:13 +0300
commite519e7774784f3fa7728657d780863805ed1c983 (patch)
tree57ed4eac0972a837383976c451fe76a3003bce0f
parent6d6d36bc6e77f8b1f86d81884ad5149931bb4acd (diff)
downloadlinux-e519e7774784f3fa7728657d780863805ed1c983.tar.xz
splice: remove detritus from generic_file_splice_read()
i_size check is a leftover from the horrors that used to play with the page cache in that function. With the switch to ->read_iter(), it's neither needed nor correct - for gfs2 it ends up being buggy, since i_size is not guaranteed to be correct until later (inside ->read_iter()). Spotted-by: Abhi Das <adas@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/splice.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/splice.c b/fs/splice.c
index 153d4f3bd441..dcaf185a5731 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -299,13 +299,8 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
{
struct iov_iter to;
struct kiocb kiocb;
- loff_t isize;
int idx, ret;
- isize = i_size_read(in->f_mapping->host);
- if (unlikely(*ppos >= isize))
- return 0;
-
iov_iter_pipe(&to, ITER_PIPE | READ, pipe, len);
idx = to.idx;
init_sync_kiocb(&kiocb, in);