From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Sun, 8 May 2022 19:07:11 +0000 (-0400)
Subject: mm/filemap: Hoist filler_t decision to the top of do_read_cache_folio()
X-Git-Tag: v5.19-rc1~169^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07950008692bf22074020e927e95655cd48fdcda;p=thirdparty%2Fkernel%2Flinux.git

mm/filemap: Hoist filler_t decision to the top of do_read_cache_folio()

Now that filler_t and aops->read_folio() have the same type, we can decide
which one to use at the top of the function, and cache ->read_folio in
the filler parameter.

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

diff --git a/mm/filemap.c b/mm/filemap.c
index 81a0ed08a82c3..9b7fa47feb5e6 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3487,6 +3487,9 @@ static struct folio *do_read_cache_folio(struct address_space *mapping,
 {
 	struct folio *folio;
 	int err;
+
+	if (!filler)
+		filler = mapping->a_ops->read_folio;
 repeat:
 	folio = filemap_get_folio(mapping, index);
 	if (!folio) {
@@ -3503,11 +3506,7 @@ repeat:
 		}
 
 filler:
-		if (filler)
-			err = filler(file, folio);
-		else
-			err = mapping->a_ops->read_folio(file, folio);
-
+		err = filler(file, folio);
 		if (err < 0) {
 			folio_put(folio);
 			return ERR_PTR(err);