diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-04 22:38:00 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:45 -0400 |
commit | a6cbcd4a4a85e2fdb0b3344b88df2e8b3d526b9e (patch) | |
tree | c0f054759a0b9c26881109968ad018fe759af458 /fs/nilfs2 | |
parent | 16b1f05d7f5ab4ce570963aca5f3b2b5d21822fa (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/nilfs2')
-rw-r--r-- | fs/nilfs2/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 1c0e8fedc095..7aaf913e8709 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c | |||
@@ -304,6 +304,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, | |||
304 | struct file *file = iocb->ki_filp; | 304 | struct file *file = iocb->ki_filp; |
305 | struct address_space *mapping = file->f_mapping; | 305 | struct address_space *mapping = file->f_mapping; |
306 | struct inode *inode = file->f_mapping->host; | 306 | struct inode *inode = file->f_mapping->host; |
307 | size_t count = iov_iter_count(iter); | ||
307 | ssize_t size; | 308 | ssize_t size; |
308 | 309 | ||
309 | if (rw == WRITE) | 310 | if (rw == WRITE) |
@@ -319,7 +320,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, | |||
319 | */ | 320 | */ |
320 | if (unlikely((rw & WRITE) && size < 0)) { | 321 | if (unlikely((rw & WRITE) && size < 0)) { |
321 | loff_t isize = i_size_read(inode); | 322 | loff_t isize = i_size_read(inode); |
322 | loff_t end = offset + iov_length(iter->iov, iter->nr_segs); | 323 | loff_t end = offset + count; |
323 | 324 | ||
324 | if (end > isize) | 325 | if (end > isize) |
325 | nilfs_write_failed(mapping, end); | 326 | nilfs_write_failed(mapping, end); |