summaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-03-04 22:38:00 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:32:45 -0400
commita6cbcd4a4a85e2fdb0b3344b88df2e8b3d526b9e (patch)
treec0f054759a0b9c26881109968ad018fe759af458 /fs/reiserfs
parent16b1f05d7f5ab4ce570963aca5f3b2b5d21822fa (diff)
downloadblackbird-op-linux-a6cbcd4a4a85e2fdb0b3344b88df2e8b3d526b9e.tar.gz
blackbird-op-linux-a6cbcd4a4a85e2fdb0b3344b88df2e8b3d526b9e.zip
get rid of pointless iov_length() in ->direct_IO()
all callers have iov_length(iter->iov, iter->nr_segs) == iov_iter_count(iter) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 17bf4c41a509..723affe921f1 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -3087,6 +3087,7 @@ static ssize_t reiserfs_direct_IO(int rw, struct kiocb *iocb,
{
struct file *file = iocb->ki_filp;
struct inode *inode = file->f_mapping->host;
+ size_t count = iov_iter_count(iter);
ssize_t ret;
ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset,
@@ -3098,7 +3099,7 @@ static ssize_t reiserfs_direct_IO(int rw, struct kiocb *iocb,
*/
if (unlikely((rw & WRITE) && ret < 0)) {
loff_t isize = i_size_read(inode);
- loff_t end = offset + iov_length(iter->iov, iter->nr_segs);
+ loff_t end = offset + count;
if ((end > isize) && inode_newsize_ok(inode, isize) == 0) {
truncate_setsize(inode, isize);
OpenPOWER on IntegriCloud