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

Commit 5e5358e7 authored Jul 25, 2011 by Hugh Dickins Committed by Linus Torvalds Jul 25, 2011

mm: cleanup descriptions of filler arg



The often-NULL data arg to read_cache_page() and read_mapping_page()
functions is misdescribed as "destination for read data": no, it's the
first arg to the filler function, often struct file * to ->readpage().

Satisfy checkpatch.pl on those filler prototypes, and tidy up the
declarations in linux/pagemap.h.

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent df077ac4

include/linux/pagemap.h

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -255,11 +255,9 @@ static inline struct page grab_cache_page(struct address_space mapping,
	extern struct page * grab_cache_page_nowait(struct address_space *mapping,		extern struct page * grab_cache_page_nowait(struct address_space *mapping,
	pgoff_t index);		pgoff_t index);
	extern struct page * read_cache_page_async(struct address_space *mapping,		extern struct page * read_cache_page_async(struct address_space *mapping,
	pgoff_t index, filler_t *filler,		pgoff_t index, filler_t filler, void data);
	void *data);
	extern struct page * read_cache_page(struct address_space *mapping,		extern struct page * read_cache_page(struct address_space *mapping,
	pgoff_t index, filler_t *filler,		pgoff_t index, filler_t filler, void data);
	void *data);
	extern struct page * read_cache_page_gfp(struct address_space *mapping,		extern struct page * read_cache_page_gfp(struct address_space *mapping,
	pgoff_t index, gfp_t gfp_mask);		pgoff_t index, gfp_t gfp_mask);
	extern int read_cache_pages(struct address_space *mapping,		extern int read_cache_pages(struct address_space *mapping,

mm/filemap.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1863,7 +1863,7 @@ out:
	* @mapping: the page's address_space		* @mapping: the page's address_space
	* @index: the page index		* @index: the page index
	* @filler: function to perform the read		* @filler: function to perform the read
	* @data: destination for read data		* @data: first arg to filler(data, page) function, often left as NULL
	*		*
	* Same as read_cache_page, but don't wait for page to become unlocked		* Same as read_cache_page, but don't wait for page to become unlocked
	* after submitting it to the filler.		* after submitting it to the filler.
	@@ -1923,7 +1923,7 @@ EXPORT_SYMBOL(read_cache_page_gfp);
	* @mapping: the page's address_space		* @mapping: the page's address_space
	* @index: the page index		* @index: the page index
	* @filler: function to perform the read		* @filler: function to perform the read
	* @data: destination for read data		* @data: first arg to filler(data, page) function, often left as NULL
	*		*
	* Read into the page cache. If a page already exists, and PageUptodate() is		* Read into the page cache. If a page already exists, and PageUptodate() is
	* not set, try to fill the page then wait for it to become unlocked.		* not set, try to fill the page then wait for it to become unlocked.