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