diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-04 21:27:34 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:44 -0400 |
commit | d8d3d94b80aa1a1c0ca75c58b8abdc7356f38418 (patch) | |
tree | 132f846b04371426b8795475597846aae75e7e07 /fs/nilfs2/inode.c | |
parent | cb66a7a1f149ff705fa37cad6d1252b046e0ad4f (diff) |
pass iov_iter to ->direct_IO()
unmodified, for now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nilfs2/inode.c')
-rw-r--r-- | fs/nilfs2/inode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index b9c5726120e3..1c0e8fedc095 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c | |||
@@ -298,8 +298,8 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping, | |||
298 | } | 298 | } |
299 | 299 | ||
300 | static ssize_t | 300 | static ssize_t |
301 | nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | 301 | nilfs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, |
302 | loff_t offset, unsigned long nr_segs) | 302 | loff_t offset) |
303 | { | 303 | { |
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; |
@@ -310,8 +310,8 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | |||
310 | return 0; | 310 | return 0; |
311 | 311 | ||
312 | /* Needs synchronization with the cleaner */ | 312 | /* Needs synchronization with the cleaner */ |
313 | size = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs, | 313 | size = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, |
314 | nilfs_get_block); | 314 | iter->nr_segs, nilfs_get_block); |
315 | 315 | ||
316 | /* | 316 | /* |
317 | * In case of error extending write may have instantiated a few | 317 | * In case of error extending write may have instantiated a few |
@@ -319,7 +319,7 @@ nilfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | |||
319 | */ | 319 | */ |
320 | if (unlikely((rw & WRITE) && size < 0)) { | 320 | if (unlikely((rw & WRITE) && size < 0)) { |
321 | loff_t isize = i_size_read(inode); | 321 | loff_t isize = i_size_read(inode); |
322 | loff_t end = offset + iov_length(iov, nr_segs); | 322 | loff_t end = offset + iov_length(iter->iov, iter->nr_segs); |
323 | 323 | ||
324 | if (end > isize) | 324 | if (end > isize) |
325 | nilfs_write_failed(mapping, end); | 325 | nilfs_write_failed(mapping, end); |