1 files changed, 7 insertions, 8 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index f2479af09da9..5885925cdb5b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1838,8 +1838,6 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
 {
         struct file *file = iocb->ki_filp;
         ssize_t retval = 0;
-        loff_t *ppos = &iocb->ki_pos;
-        loff_t pos = *ppos;
         size_t count = iov_iter_count(iter);
 
         if (!count)
@@ -1851,15 +1849,16 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
                 loff_t size;
 
                 size = i_size_read(inode);
-                retval = filemap_write_and_wait_range(mapping, pos,
-                                        pos + count - 1);
+                retval = filemap_write_and_wait_range(mapping, iocb->ki_pos,
+                                        iocb->ki_pos + count - 1);
                 if (!retval) {
                         struct iov_iter data = *iter;
-                        retval = mapping->a_ops->direct_IO(iocb, &data, pos);
+                        retval = mapping->a_ops->direct_IO(iocb, &data,
+                                        iocb->ki_pos);
                 }
 
                 if (retval > 0) {
-                        *ppos = pos + retval;
+                        iocb->ki_pos += retval;
                         iov_iter_advance(iter, retval);
                 }
 
@@ -1872,14 +1871,14 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
                  * the rest of the read.  Buffered reads will not work for
                  * DAX files, so don't bother trying.
                  */
-                if (retval < 0 || !iov_iter_count(iter) || *ppos >= size ||
+                if (retval < 0 || !iov_iter_count(iter) || iocb->ki_pos >= size ||
                     IS_DAX(inode)) {
                         file_accessed(file);
                         goto out;
                 }
         }
 
-        retval = do_generic_file_read(file, ppos, iter, retval);
+        retval = do_generic_file_read(file, &iocb->ki_pos, iter, retval);
 out:
         return retval;
 }