1 files changed, 5 insertions, 11 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 9c5e6235cc74..f3555fb806d3 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1317,7 +1317,8 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         goto out; /* skip atime */
                 size = i_size_read(inode);
                 if (pos < size) {
-                        retval = filemap_write_and_wait(mapping);
+                        retval = filemap_write_and_wait_range(mapping, pos,
+                                        pos + iov_length(iov, nr_segs) - 1);
                         if (!retval) {
                                 retval = mapping->a_ops->direct_IO(READ, iocb,
                                                         iov, pos, nr_segs);
@@ -2059,18 +2060,10 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
         if (count != ocount)
                 *nr_segs = iov_shorten((struct iovec *)iov, *nr_segs, count);
 
-        /*
-         * Unmap all mmappings of the file up-front.
-         *
-         * This will cause any pte dirty bits to be propagated into the
-         * pageframes for the subsequent filemap_write_and_wait().
-         */
         write_len = iov_length(iov, *nr_segs);
         end = (pos + write_len - 1) >> PAGE_CACHE_SHIFT;
-        if (mapping_mapped(mapping))
-                unmap_mapping_range(mapping, pos, write_len, 0);
 
-        written = filemap_write_and_wait(mapping);
+        written = filemap_write_and_wait_range(mapping, pos, pos + write_len - 1);
         if (written)
                 goto out;
 
@@ -2290,7 +2283,8 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
          * the file data here, to try to honour O_DIRECT expectations.
          */
         if (unlikely(file->f_flags & O_DIRECT) && written)
-                status = filemap_write_and_wait(mapping);
+                status = filemap_write_and_wait_range(mapping,
+                                        pos, pos + written - 1);
 
         return written ? written : status;
 }