Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e335905b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alistair Strachan
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Change-Id: I720afb2e0c28d5649b62ed3852b48ac63dc0d7a8
Link: https://lkml.org/lkml/2019/5/1/294


Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent e315deff

include/linux/pagemap.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

}



/*

mm/filemap.c

+6 −4
Original line number Diff line number Diff line
@@ -2875,7 +2875,11 @@ static struct page *do_read_cache_page(struct address_space *mapping, 
		}



filler:

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