From 2bf50b5a8e1d83537dafb34f614d50eadc02cfbb Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 1 May 2019 09:26:37 -0400 Subject: [PATCH] FROMLIST: mm: don't cast ->readpage to filler_t for do_read_cache_page We can just pass a NULL filler and do the right thing inside of do_read_cache_page based on the NULL parameter. Signed-off-by: Christoph Hellwig Bug: 133186739 Change-Id: I720afb2e0c28d5649b62ed3852b48ac63dc0d7a8 Link: https://lkml.org/lkml/2019/5/1/294 Signed-off-by: Sami Tolvanen --- include/linux/pagemap.h | 3 +-- mm/filemap.c | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index cce0b126c8f0..78cac3fc3ce5 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -399,8 +399,7 @@ extern int read_cache_pages(struct address_space *mapping, static inline struct page *read_mapping_page(struct address_space *mapping, pgoff_t index, void *data) { - filler_t *filler = (filler_t *)mapping->a_ops->readpage; - return read_cache_page(mapping, index, filler, data); + return read_cache_page(mapping, index, NULL, data); } /* diff --git a/mm/filemap.c b/mm/filemap.c index b60294923142..99aa6ae0bf19 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2875,7 +2875,11 @@ static struct page *do_read_cache_page(struct address_space *mapping, } filler: - err = filler(data, page); + if (filler) + err = filler(data, page); + else + err = mapping->a_ops->readpage(data, page); + if (err < 0) { put_page(page); return ERR_PTR(err); @@ -2982,9 +2986,7 @@ struct page *read_cache_page_gfp(struct address_space *mapping, pgoff_t index, gfp_t gfp) { - filler_t *filler = (filler_t *)mapping->a_ops->readpage; - - return do_read_cache_page(mapping, index, filler, NULL, gfp); + return do_read_cache_page(mapping, index, NULL, NULL, gfp); } EXPORT_SYMBOL(read_cache_page_gfp);