2 files changed, 23 insertions, 22 deletions

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 7e70506297bc..89fdfd1919af 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2710,6 +2710,9 @@ fuse_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
         inode = file->f_mapping->host;
         i_size = i_size_read(inode);
 
+        if ((rw == READ) && (offset > i_size))
+                return 0;
+
         /* optimization for short read */
         if (async_dio && rw != WRITE && offset + count > i_size) {
                 if (offset >= i_size)
diff --git a/mm/filemap.c b/mm/filemap.c
index b7749a92021c..01842867c9d2 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1428,30 +1428,28 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                 if (!count)
                         goto out; /* skip atime */
                 size = i_size_read(inode);
-                if (pos < size) {
-                        retval = filemap_write_and_wait_range(mapping, pos,
+                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);
-                        }
-                        if (retval > 0) {
-                                *ppos = pos + retval;
-                                count -= retval;
-                        }
+                if (!retval) {
+                        retval = mapping->a_ops->direct_IO(READ, iocb,
+                                                           iov, pos, nr_segs);
+                }
+                if (retval > 0) {
+                        *ppos = pos + retval;
+                        count -= retval;
+                }
 
-                        /*
-                         * Btrfs can have a short DIO read if we encounter
-                         * compressed extents, so if there was an error, or if
-                         * we've already read everything we wanted to, or if
-                         * there was a short read because we hit EOF, go ahead
-                         * and return.  Otherwise fallthrough to buffered io for
-                         * the rest of the read.
-                         */
-                        if (retval < 0 || !count || *ppos >= size) {
-                                file_accessed(filp);
-                                goto out;
-                        }
+                /*
+                 * Btrfs can have a short DIO read if we encounter
+                 * compressed extents, so if there was an error, or if
+                 * we've already read everything we wanted to, or if
+                 * there was a short read because we hit EOF, go ahead
+                 * and return.  Otherwise fallthrough to buffered io for
+                 * the rest of the read.
+                 */
+                if (retval < 0 || !count || *ppos >= size) {
+                        file_accessed(filp);
+                        goto out;
                 }
         }