1 files changed, 38 insertions, 11 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 5dfc093ceb3d..070e7547d5b5 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1726,7 +1726,7 @@ int generic_file_readonly_mmap(struct file * file, struct vm_area_struct * vma)
 EXPORT_SYMBOL(generic_file_mmap);
 EXPORT_SYMBOL(generic_file_readonly_mmap);
 
-static inline struct page *__read_cache_page(struct address_space *mapping,
+static struct page *__read_cache_page(struct address_space *mapping,
                                 unsigned long index,
                                 int (*filler)(void *,struct page*),
                                 void *data)
@@ -1763,17 +1763,11 @@ repeat:
         return page;
 }
 
-/**
- * read_cache_page - read into page cache, fill it if needed
- * @mapping:    the page's address_space
- * @index:      the page index
- * @filler:     function to perform the read
- * @data:       destination for read data
- *
- * Read into the page cache. If a page already exists,
- * and PageUptodate() is not set, try to fill the page.
+/*
+ * Same as read_cache_page, but don't wait for page to become unlocked
+ * after submitting it to the filler.
  */
-struct page *read_cache_page(struct address_space *mapping,
+struct page *read_cache_page_async(struct address_space *mapping,
                                 unsigned long index,
                                 int (*filler)(void *,struct page*),
                                 void *data)
@@ -1805,6 +1799,39 @@ retry:
                 page = ERR_PTR(err);
         }
  out:
+        mark_page_accessed(page);
+        return page;
+}
+EXPORT_SYMBOL(read_cache_page_async);
+
+/**
+ * read_cache_page - read into page cache, fill it if needed
+ * @mapping:    the page's address_space
+ * @index:      the page index
+ * @filler:     function to perform the read
+ * @data:       destination for read data
+ *
+ * Read into the page cache. If a page already exists, and PageUptodate() is
+ * not set, try to fill the page then wait for it to become unlocked.
+ *
+ * If the page does not get brought uptodate, return -EIO.
+ */
+struct page *read_cache_page(struct address_space *mapping,
+                                unsigned long index,
+                                int (*filler)(void *,struct page*),
+                                void *data)
+{
+        struct page *page;
+
+        page = read_cache_page_async(mapping, index, filler, data);
+        if (IS_ERR(page))
+                goto out;
+        wait_on_page_locked(page);
+        if (!PageUptodate(page)) {
+                page_cache_release(page);
+                page = ERR_PTR(-EIO);
+        }
+ out:
         return page;
 }
 EXPORT_SYMBOL(read_cache_page);