mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-05-08 15:07:11 -04:00
parent e9b5b23e95
commit 0795000869
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mm/filemap.c
View File

@ -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);