3 files changed, 9 insertions, 14 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index ead8f44f7973..200bdb0779f0 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -165,26 +165,21 @@ nfs_file_flush(struct file *file, fl_owner_t id)
 EXPORT_SYMBOL_GPL(nfs_file_flush);
 
 ssize_t
-nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
-                unsigned long nr_segs, loff_t pos)
+nfs_file_read(struct kiocb *iocb, struct iov_iter *to)
 {
         struct inode *inode = file_inode(iocb->ki_filp);
-        size_t count = iov_length(iov, nr_segs);
         ssize_t result;
-        struct iov_iter to;
-
-        iov_iter_init(&to, READ, iov, nr_segs, count);
 
         if (iocb->ki_filp->f_flags & O_DIRECT)
-                return nfs_file_direct_read(iocb, &to, pos, true);
+                return nfs_file_direct_read(iocb, to, iocb->ki_pos, true);
 
         dprintk("NFS: read(%pD2, %zu@%lu)\n",
                 iocb->ki_filp,
-                count, (unsigned long) pos);
+                iov_iter_count(to), (unsigned long) iocb->ki_pos);
 
         result = nfs_revalidate_mapping(inode, iocb->ki_filp->f_mapping);
         if (!result) {
-                result = generic_file_read_iter(iocb, &to);
+                result = generic_file_read_iter(iocb, to);
                 if (result > 0)
                         nfs_add_stats(inode, NFSIOS_NORMALREADBYTES, result);
         }
@@ -945,9 +940,9 @@ EXPORT_SYMBOL_GPL(nfs_setlease);
 
 const struct file_operations nfs_file_operations = {
         .llseek         = nfs_file_llseek,
-        .read           = do_sync_read,
+        .read           = new_sync_read,
         .write          = do_sync_write,
-        .aio_read       = nfs_file_read,
+        .read_iter      = nfs_file_read,
         .aio_write      = nfs_file_write,
         .mmap           = nfs_file_mmap,
         .open           = nfs_file_open,
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index dd8bfc2e2464..e598e4a852ad 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -320,7 +320,7 @@ int nfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *)
 int nfs_file_fsync_commit(struct file *, loff_t, loff_t, int);
 loff_t nfs_file_llseek(struct file *, loff_t, int);
 int nfs_file_flush(struct file *, fl_owner_t);
-ssize_t nfs_file_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
+ssize_t nfs_file_read(struct kiocb *, struct iov_iter *);
 ssize_t nfs_file_splice_read(struct file *, loff_t *, struct pipe_inode_info *,
                              size_t, unsigned int);
 int nfs_file_mmap(struct file *, struct vm_area_struct *);
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 8de3407e0360..37a998cae963 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -118,9 +118,9 @@ nfs4_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 
 const struct file_operations nfs4_file_operations = {
         .llseek         = nfs_file_llseek,
-        .read           = do_sync_read,
+        .read           = new_sync_read,
         .write          = do_sync_write,
-        .aio_read       = nfs_file_read,
+        .read_iter      = nfs_file_read,
         .aio_write      = nfs_file_write,
         .mmap           = nfs_file_mmap,
         .open           = nfs4_file_open,