ext4: switch the guts of ->direct_IO() to iov_iter

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 7 insertions, 8 deletions

diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 594009f5f523..eb5ae16902d0 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -639,8 +639,7 @@ out:
  * VFS code falls back into buffered path in that case so we are safe.
  */
 ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
-                           const struct iovec *iov, loff_t offset,
-                           unsigned long nr_segs)
+                           struct iov_iter *iter, loff_t offset)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
@@ -648,7 +647,7 @@ ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
         handle_t *handle;
         ssize_t ret;
         int orphan = 0;
-        size_t count = iov_length(iov, nr_segs);
+        size_t count = iov_length(iter->iov, iter->nr_segs);
         int retries = 0;
 
         if (rw == WRITE) {
@@ -687,18 +686,18 @@ retry:
                         goto locked;
                 }
                 ret = __blockdev_direct_IO(rw, iocb, inode,
-                                 inode->i_sb->s_bdev, iov,
-                                 offset, nr_segs,
+                                 inode->i_sb->s_bdev, iter->iov,
+                                 offset, iter->nr_segs,
                                  ext4_get_block, NULL, NULL, 0);
                 inode_dio_done(inode);
         } else {
 locked:
-                ret = blockdev_direct_IO(rw, iocb, inode, iov,
-                                 offset, nr_segs, ext4_get_block);
+                ret = blockdev_direct_IO(rw, iocb, inode, iter->iov,
+                                 offset, iter->nr_segs, ext4_get_block);
 
                 if (unlikely((rw & WRITE) && ret < 0)) {
                         loff_t isize = i_size_read(inode);
-                        loff_t end = offset + iov_length(iov, nr_segs);
+                        loff_t end = offset + count;
 
                         if (end > isize)
                                 ext4_truncate_failed_write(inode);