Fix a bad error case handling in read_cache_page_async()

Commit 6fe6900e1e5b6fa9e5c59aa5061f244fe3f467e2 introduced a nasty bug
in read_cache_page_async().

It added a "mark_page_accessed(page)" at the final return path in
read_cache_page_async().  But in error cases, 'page' holds the error
code, and you can't mark it accessed.

[ and Glauber de Oliveira Costa points out that we can use a return
  instead of adding more goto's ]

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 9e56fd158fa3..7b48b2ad00e7 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1784,7 +1784,7 @@ struct page *read_cache_page_async(struct address_space *mapping,
 retry:
         page = __read_cache_page(mapping, index, filler, data);
         if (IS_ERR(page))
-                goto out;
+                return page;
         mark_page_accessed(page);
         if (PageUptodate(page))
                 goto out;
@@ -1802,9 +1802,9 @@ retry:
         err = filler(data, page);
         if (err < 0) {
                 page_cache_release(page);
-                page = ERR_PTR(err);
+                return ERR_PTR(err);
         }
- out:
+out:
         mark_page_accessed(page);
         return page;
 }