diff options
| author |   Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-08 15:07:11 -0400 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-09 16:36:52 -0400 |
| commit | 07950008692bf22074020e927e95655cd48fdcda (patch) | |
| tree | ba1af1115941d1cfea1e45e2dc5c06e953775cba /mm/filemap.c | |
| parent | fs: Change the type of filler_t (diff) | |
| download | linux-dev-07950008692bf22074020e927e95655cd48fdcda.tar.xz linux-dev-07950008692bf22074020e927e95655cd48fdcda.zip | |
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>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 81a0ed08a82c..9b7fa47feb5e 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); |