iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm/filemap: don't cast ->readpage to filler_t for do_read_cache_page

Browse Source 
We can just pass a NULL filler and do the right thing inside of
do_read_cache_page based on the NULL parameter.

Link: http://lkml.kernel.org/r/20190520055731.24538-3-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2019-07-11 20:55:20 -07:00 committed by Linus Torvalds
parent d322a8e5e3
commit 6c45b45419
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/pagemap.h
View File

@ -383,8 +383,7 @@ extern int read_cache_pages(struct address_space *mapping,
static inline struct page *read_mapping_page(struct address_space *mapping, static inline struct page *read_mapping_page(struct address_space *mapping,
pgoff_t index, void *data) pgoff_t index, void *data)
{ {
filler_t *filler = (filler_t *)mapping->a_ops->readpage; return read_cache_page(mapping, index, NULL, data);
return read_cache_page(mapping, index, filler, data);
} }
/* /*

10
mm/filemap.c
View File

@ -2825,7 +2825,11 @@ repeat:
} }
filler: filler:
err = filler(data, page); if (filler)
err = filler(data, page);
else
err = mapping->a_ops->readpage(data, page);
if (err < 0) { if (err < 0) {
put_page(page); put_page(page);
return ERR_PTR(err); return ERR_PTR(err);
@ -2937,9 +2941,7 @@ struct page *read_cache_page_gfp(struct address_space *mapping,
pgoff_t index, pgoff_t index,
gfp_t gfp) gfp_t gfp)
{ {
filler_t *filler = (filler_t *)mapping->a_ops->readpage; return do_read_cache_page(mapping, index, NULL, NULL, gfp);
return do_read_cache_page(mapping, index, filler, NULL, gfp);
} }
EXPORT_SYMBOL(read_cache_page_gfp); EXPORT_SYMBOL(read_cache_page_gfp);