From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Thu, 12 May 2022 21:12:21 +0000 (-0400)
Subject: filemap: Move 'filler' case to the end of do_read_cache_folio()
X-Git-Tag: microblaze-v6.1~158^2~61
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=9bc3e869386bdf5a00ecf71d6592050997e69d53;p=linux-2.6-microblaze.git

filemap: Move 'filler' case to the end of do_read_cache_folio()

No functionality change intended; this simply moves code around to
disentangle the function a little.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---

diff --git a/mm/filemap.c b/mm/filemap.c
index 15399e8cd281..c821bc4a648b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3492,20 +3492,7 @@ repeat:
 			return ERR_PTR(err);
 		}
 
-filler:
-		err = filler(file, folio);
-		if (err < 0) {
-			folio_put(folio);
-			return ERR_PTR(err);
-		}
-
-		folio_wait_locked(folio);
-		if (!folio_test_uptodate(folio)) {
-			folio_put(folio);
-			return ERR_PTR(-EIO);
-		}
-
-		goto out;
+		goto filler;
 	}
 	if (folio_test_uptodate(folio))
 		goto out;
@@ -3535,7 +3522,18 @@ filler:
 	 * set again if read page fails.
 	 */
 	folio_clear_error(folio);
-	goto filler;
+filler:
+	err = filler(file, folio);
+	if (err < 0) {
+		folio_put(folio);
+		return ERR_PTR(err);
+	}
+
+	folio_wait_locked(folio);
+	if (!folio_test_uptodate(folio)) {
+		folio_put(folio);
+		return ERR_PTR(-EIO);
+	}
 
 out:
 	folio_mark_accessed(folio);