Commit c14c6843 authored Feb 09, 2022 by Matthew Wilcox (Oracle)

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) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs

parent 1241ebec

include/linux/pagemap.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/*