1 files changed, 37 insertions, 5 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 88d719665a28..45a2d18df849 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1105,6 +1105,12 @@ page_not_up_to_date_locked:
                 }
 
 readpage:
+                /*
+                 * A previous I/O error may have been due to temporary
+                 * failures, eg. multipath errors.
+                 * PG_error will be set again if readpage fails.
+                 */
+                ClearPageError(page);
                 /* Start the actual read. The read will unlock the page. */
                 error = mapping->a_ops->readpage(filp, page);
 
@@ -1269,7 +1275,7 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 {
         struct file *filp = iocb->ki_filp;
         ssize_t retval;
-        unsigned long seg;
+        unsigned long seg = 0;
         size_t count;
         loff_t *ppos = &iocb->ki_pos;
 
@@ -1296,21 +1302,47 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                                 retval = mapping->a_ops->direct_IO(READ, iocb,
                                                         iov, pos, nr_segs);
                         }
-                        if (retval > 0)
+                        if (retval > 0) {
                                 *ppos = pos + retval;
-                        if (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;
                         }
                 }
         }
 
+        count = retval;
         for (seg = 0; seg < nr_segs; seg++) {
                 read_descriptor_t desc;
+                loff_t offset = 0;
+
+                /*
+                 * If we did a short DIO read we need to skip the section of the
+                 * iov that we've already read data into.
+                 */
+                if (count) {
+                        if (count > iov[seg].iov_len) {
+                                count -= iov[seg].iov_len;
+                                continue;
+                        }
+                        offset = count;
+                        count = 0;
+                }
 
                 desc.written = 0;
-                desc.arg.buf = iov[seg].iov_base;
-                desc.count = iov[seg].iov_len;
+                desc.arg.buf = iov[seg].iov_base + offset;
+                desc.count = iov[seg].iov_len - offset;
                 if (desc.count == 0)
                         continue;
                 desc.error = 0;