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>
This commit is contained in:

committed by
Linus Torvalds

parent
df077ac468
commit
5e5358e7cf
12
mm/filemap.c
12
mm/filemap.c
@@ -1792,7 +1792,7 @@ EXPORT_SYMBOL(generic_file_readonly_mmap);
|
||||
|
||||
static struct page *__read_cache_page(struct address_space *mapping,
|
||||
pgoff_t index,
|
||||
int (*filler)(void *,struct page*),
|
||||
int (*filler)(void *, struct page *),
|
||||
void *data,
|
||||
gfp_t gfp)
|
||||
{
|
||||
@@ -1823,7 +1823,7 @@ repeat:
|
||||
|
||||
static struct page *do_read_cache_page(struct address_space *mapping,
|
||||
pgoff_t index,
|
||||
int (*filler)(void *,struct page*),
|
||||
int (*filler)(void *, struct page *),
|
||||
void *data,
|
||||
gfp_t gfp)
|
||||
|
||||
@@ -1863,7 +1863,7 @@ out:
|
||||
* @mapping: the page's address_space
|
||||
* @index: the page index
|
||||
* @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
|
||||
* after submitting it to the filler.
|
||||
@@ -1875,7 +1875,7 @@ out:
|
||||
*/
|
||||
struct page *read_cache_page_async(struct address_space *mapping,
|
||||
pgoff_t index,
|
||||
int (*filler)(void *,struct page*),
|
||||
int (*filler)(void *, struct page *),
|
||||
void *data)
|
||||
{
|
||||
return do_read_cache_page(mapping, index, filler, data, mapping_gfp_mask(mapping));
|
||||
@@ -1923,7 +1923,7 @@ EXPORT_SYMBOL(read_cache_page_gfp);
|
||||
* @mapping: the page's address_space
|
||||
* @index: the page index
|
||||
* @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
|
||||
* not set, try to fill the page then wait for it to become unlocked.
|
||||
@@ -1932,7 +1932,7 @@ EXPORT_SYMBOL(read_cache_page_gfp);
|
||||
*/
|
||||
struct page *read_cache_page(struct address_space *mapping,
|
||||
pgoff_t index,
|
||||
int (*filler)(void *,struct page*),
|
||||
int (*filler)(void *, struct page *),
|
||||
void *data)
|
||||
{
|
||||
return wait_on_page_read(read_cache_page_async(mapping, index, filler, data));
|
||||
|
Reference in New Issue
Block a user