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/hfsplus | |
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/hfsplus')
-rw-r--r-- | fs/hfsplus/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index 7f894a5b5eaf..e6b1251af47a 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
@@ -128,6 +128,7 @@ static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, | |||
128 | struct file *file = iocb->ki_filp; | 128 | struct file *file = iocb->ki_filp; |
129 | struct address_space *mapping = file->f_mapping; | 129 | struct address_space *mapping = file->f_mapping; |
130 | struct inode *inode = file_inode(file)->i_mapping->host; | 130 | struct inode *inode = file_inode(file)->i_mapping->host; |
131 | size_t count = iov_iter_count(iter); | ||
131 | ssize_t ret; | 132 | ssize_t ret; |
132 | 133 | ||
133 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, iter->nr_segs, | 134 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, iter->nr_segs, |
@@ -139,7 +140,7 @@ static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, | |||
139 | */ | 140 | */ |
140 | if (unlikely((rw & WRITE) && ret < 0)) { | 141 | if (unlikely((rw & WRITE) && ret < 0)) { |
141 | loff_t isize = i_size_read(inode); | 142 | loff_t isize = i_size_read(inode); |
142 | loff_t end = offset + iov_length(iter->iov, iter->nr_segs); | 143 | loff_t end = offset + count; |
143 | 144 | ||
144 | if (end > isize) | 145 | if (end > isize) |
145 | hfsplus_write_failed(mapping, end); | 146 | hfsplus_write_failed(mapping, end); |