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/fat | |
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/fat')
-rw-r--r-- | fs/fat/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index d5237a199055..154a6f9d3189 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -191,6 +191,7 @@ static ssize_t fat_direct_IO(int rw, struct kiocb *iocb, | |||
191 | struct file *file = iocb->ki_filp; | 191 | struct file *file = iocb->ki_filp; |
192 | struct address_space *mapping = file->f_mapping; | 192 | struct address_space *mapping = file->f_mapping; |
193 | struct inode *inode = mapping->host; | 193 | struct inode *inode = mapping->host; |
194 | size_t count = iov_iter_count(iter); | ||
194 | ssize_t ret; | 195 | ssize_t ret; |
195 | 196 | ||
196 | if (rw == WRITE) { | 197 | if (rw == WRITE) { |
@@ -203,7 +204,7 @@ static ssize_t fat_direct_IO(int rw, struct kiocb *iocb, | |||
203 | * | 204 | * |
204 | * Return 0, and fallback to normal buffered write. | 205 | * Return 0, and fallback to normal buffered write. |
205 | */ | 206 | */ |
206 | loff_t size = offset + iov_length(iter->iov, iter->nr_segs); | 207 | loff_t size = offset + count; |
207 | if (MSDOS_I(inode)->mmu_private < size) | 208 | if (MSDOS_I(inode)->mmu_private < size) |
208 | return 0; | 209 | return 0; |
209 | } | 210 | } |
@@ -215,8 +216,7 @@ static ssize_t fat_direct_IO(int rw, struct kiocb *iocb, | |||
215 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, | 216 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, |
216 | iter->nr_segs, fat_get_block); | 217 | iter->nr_segs, fat_get_block); |
217 | if (ret < 0 && (rw & WRITE)) | 218 | if (ret < 0 && (rw & WRITE)) |
218 | fat_write_failed(mapping, offset + | 219 | fat_write_failed(mapping, offset + count); |
219 | iov_length(iter->iov, iter->nr_segs)); | ||
220 | 220 | ||
221 | return ret; | 221 | return ret; |
222 | } | 222 | } |