From: Matthew Wilcox (Oracle) Date: Wed, 9 Feb 2022 20:21:23 +0000 (+0000) Subject: fs: read_mapping_page() should take a struct file argument X-Git-Tag: v6.1-rc5~1776^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c14c6843aeb8cdc8f6b0e49411d230e6f6dfda62;p=platform%2Fkernel%2Flinux-starfive.git fs: read_mapping_page() should take a struct file argument While read_cache_page() takes a void *, because you can pass a pointer to anything as the first argument of filler_t, if we are calling read_mapping_page(), it will be passed as the first argument of ->readpage, so we know this must be a struct file pointer, and we should let the compiler enforce that for us. Signed-off-by: Matthew Wilcox (Oracle) Tested-by: Damien Le Moal Acked-by: Damien Le Moal Tested-by: Mike Marshall # orangefs Tested-by: David Howells # afs --- diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 270bf51..55a80d8 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -636,15 +636,15 @@ extern int read_cache_pages(struct address_space *mapping, struct list_head *pages, filler_t *filler, void *data); static inline struct page *read_mapping_page(struct address_space *mapping, - pgoff_t index, void *data) + pgoff_t index, struct file *file) { - return read_cache_page(mapping, index, NULL, data); + return read_cache_page(mapping, index, NULL, file); } static inline struct folio *read_mapping_folio(struct address_space *mapping, - pgoff_t index, void *data) + pgoff_t index, struct file *file) { - return read_cache_folio(mapping, index, NULL, data); + return read_cache_folio(mapping, index, NULL, file); } /*