aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
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/ext4/inode.c
parent16b1f05d7f5ab4ce570963aca5f3b2b5d21822fa (diff)
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/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 29996c1b673e..2b993579a968 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3090,7 +3090,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
3090 struct file *file = iocb->ki_filp; 3090 struct file *file = iocb->ki_filp;
3091 struct inode *inode = file->f_mapping->host; 3091 struct inode *inode = file->f_mapping->host;
3092 ssize_t ret; 3092 ssize_t ret;
3093 size_t count = iov_length(iter->iov, iter->nr_segs); 3093 size_t count = iov_iter_count(iter);
3094 int overwrite = 0; 3094 int overwrite = 0;
3095 get_block_t *get_block_func = NULL; 3095 get_block_t *get_block_func = NULL;
3096 int dio_flags = 0; 3096 int dio_flags = 0;
@@ -3225,6 +3225,7 @@ static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
3225{ 3225{
3226 struct file *file = iocb->ki_filp; 3226 struct file *file = iocb->ki_filp;
3227 struct inode *inode = file->f_mapping->host; 3227 struct inode *inode = file->f_mapping->host;
3228 size_t count = iov_iter_count(iter);
3228 ssize_t ret; 3229 ssize_t ret;
3229 3230
3230 /* 3231 /*
@@ -3237,13 +3238,12 @@ static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb,
3237 if (ext4_has_inline_data(inode)) 3238 if (ext4_has_inline_data(inode))
3238 return 0; 3239 return 0;
3239 3240
3240 trace_ext4_direct_IO_enter(inode, offset, iov_length(iter->iov, iter->nr_segs), rw); 3241 trace_ext4_direct_IO_enter(inode, offset, count, rw);
3241 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) 3242 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
3242 ret = ext4_ext_direct_IO(rw, iocb, iter, offset); 3243 ret = ext4_ext_direct_IO(rw, iocb, iter, offset);
3243 else 3244 else
3244 ret = ext4_ind_direct_IO(rw, iocb, iter, offset); 3245 ret = ext4_ind_direct_IO(rw, iocb, iter, offset);
3245 trace_ext4_direct_IO_exit(inode, offset, 3246 trace_ext4_direct_IO_exit(inode, offset, count, rw, ret);
3246 iov_length(iter->iov, iter->nr_segs), rw, ret);
3247 return ret; 3247 return ret;
3248} 3248}
3249 3249