summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2017-09-06 19:21:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-06 20:27:27 -0400
commit397162ffa2ed1cadffe05c324c6ddc53647f9c62 (patch)
tree4a084bf8baee85c2b0624bba4907ceb72ace416c /fs
parentf7b68046873724129798c405e1a4e326b409c08f (diff)
mm: remove nr_pages argument from pagevec_lookup{,_range}()
All users of pagevec_lookup() and pagevec_lookup_range() now pass PAGEVEC_SIZE as a desired number of pages. Just drop the argument. Link: http://lkml.kernel.org/r/20170726114704.7626-11-jack@suse.cz Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/buffer.c5
-rw-r--r--fs/ext4/file.c2
-rw-r--r--fs/ext4/inode.c5
-rw-r--r--fs/fscache/page.c2
-rw-r--r--fs/hugetlbfs/inode.c3
-rw-r--r--fs/nilfs2/page.c2
6 files changed, 8 insertions, 11 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 8770b58ca569..50da0e102ca0 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1633,8 +1633,7 @@ void clean_bdev_aliases(struct block_device *bdev, sector_t block, sector_t len)
1633 1633
1634 end = (block + len - 1) >> (PAGE_SHIFT - bd_inode->i_blkbits); 1634 end = (block + len - 1) >> (PAGE_SHIFT - bd_inode->i_blkbits);
1635 pagevec_init(&pvec, 0); 1635 pagevec_init(&pvec, 0);
1636 while (pagevec_lookup_range(&pvec, bd_mapping, &index, end, 1636 while (pagevec_lookup_range(&pvec, bd_mapping, &index, end)) {
1637 PAGEVEC_SIZE)) {
1638 count = pagevec_count(&pvec); 1637 count = pagevec_count(&pvec);
1639 for (i = 0; i < count; i++) { 1638 for (i = 0; i < count; i++) {
1640 struct page *page = pvec.pages[i]; 1639 struct page *page = pvec.pages[i];
@@ -3552,7 +3551,7 @@ page_cache_seek_hole_data(struct inode *inode, loff_t offset, loff_t length,
3552 unsigned nr_pages, i; 3551 unsigned nr_pages, i;
3553 3552
3554 nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, &index, 3553 nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, &index,
3555 end - 1, PAGEVEC_SIZE); 3554 end - 1);
3556 if (nr_pages == 0) 3555 if (nr_pages == 0)
3557 break; 3556 break;
3558 3557
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 726344809721..484c1326dd6a 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -468,7 +468,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode,
468 unsigned long nr_pages; 468 unsigned long nr_pages;
469 469
470 nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, 470 nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping,
471 &index, end, PAGEVEC_SIZE); 471 &index, end);
472 if (nr_pages == 0) 472 if (nr_pages == 0)
473 break; 473 break;
474 474
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 6103ce0430df..ce68a3483666 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1720,8 +1720,7 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,
1720 1720
1721 pagevec_init(&pvec, 0); 1721 pagevec_init(&pvec, 0);
1722 while (index <= end) { 1722 while (index <= end) {
1723 nr_pages = pagevec_lookup_range(&pvec, mapping, &index, end, 1723 nr_pages = pagevec_lookup_range(&pvec, mapping, &index, end);
1724 PAGEVEC_SIZE);
1725 if (nr_pages == 0) 1724 if (nr_pages == 0)
1726 break; 1725 break;
1727 for (i = 0; i < nr_pages; i++) { 1726 for (i = 0; i < nr_pages; i++) {
@@ -2348,7 +2347,7 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)
2348 pagevec_init(&pvec, 0); 2347 pagevec_init(&pvec, 0);
2349 while (start <= end) { 2348 while (start <= end) {
2350 nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, 2349 nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping,
2351 &start, end, PAGEVEC_SIZE); 2350 &start, end);
2352 if (nr_pages == 0) 2351 if (nr_pages == 0)
2353 break; 2352 break;
2354 for (i = 0; i < nr_pages; i++) { 2353 for (i = 0; i < nr_pages; i++) {
diff --git a/fs/fscache/page.c b/fs/fscache/page.c
index 83018861dcd2..0ad3fd3ad0b4 100644
--- a/fs/fscache/page.c
+++ b/fs/fscache/page.c
@@ -1178,7 +1178,7 @@ void __fscache_uncache_all_inode_pages(struct fscache_cookie *cookie,
1178 pagevec_init(&pvec, 0); 1178 pagevec_init(&pvec, 0);
1179 next = 0; 1179 next = 0;
1180 do { 1180 do {
1181 if (!pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) 1181 if (!pagevec_lookup(&pvec, mapping, &next))
1182 break; 1182 break;
1183 for (i = 0; i < pagevec_count(&pvec); i++) { 1183 for (i = 0; i < pagevec_count(&pvec); i++) {
1184 struct page *page = pvec.pages[i]; 1184 struct page *page = pvec.pages[i];
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 8931236f3ef4..7c02b3f738e1 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -413,8 +413,7 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
413 /* 413 /*
414 * When no more pages are found, we are done. 414 * When no more pages are found, we are done.
415 */ 415 */
416 if (!pagevec_lookup_range(&pvec, mapping, &next, end - 1, 416 if (!pagevec_lookup_range(&pvec, mapping, &next, end - 1))
417 PAGEVEC_SIZE))
418 break; 417 break;
419 418
420 for (i = 0; i < pagevec_count(&pvec); ++i) { 419 for (i = 0; i < pagevec_count(&pvec); ++i) {
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 382a36c72d72..8616c46d33da 100644
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -312,7 +312,7 @@ void nilfs_copy_back_pages(struct address_space *dmap,
312 312
313 pagevec_init(&pvec, 0); 313 pagevec_init(&pvec, 0);
314repeat: 314repeat:
315 n = pagevec_lookup(&pvec, smap, &index, PAGEVEC_SIZE); 315 n = pagevec_lookup(&pvec, smap, &index);
316 if (!n) 316 if (!n)
317 return; 317 return;
318 318