aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-03-04 15:24:06 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:32:43 -0400
commitcb66a7a1f149ff705fa37cad6d1252b046e0ad4f (patch)
tree32dd17f294e9ef96bfea727bba313a33590917ab /fs/fuse
parent0ae5e4d370599592eab845527b31708a4f3411be (diff)
kill generic_segment_checks()
all callers of ->aio_read() and ->aio_write() have iov/nr_segs already checked - generic_segment_checks() done after that is just an odd way to spell iov_length(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 126deb5d0a9c..9c7f346879e7 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1208,12 +1208,7 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
1208 1208
1209 WARN_ON(iocb->ki_pos != pos); 1209 WARN_ON(iocb->ki_pos != pos);
1210 1210
1211 ocount = 0; 1211 count = ocount = iov_length(iov, nr_segs);
1212 err = generic_segment_checks(iov, &nr_segs, &ocount, VERIFY_READ);
1213 if (err)
1214 return err;
1215
1216 count = ocount;
1217 mutex_lock(&inode->i_mutex); 1212 mutex_lock(&inode->i_mutex);
1218 1213
1219 /* We can write back this queue in page reclaim */ 1214 /* We can write back this queue in page reclaim */