mm: remove nr_pages argument from pagevec_lookup_{,range}_tag()

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/20171009151359.31984-15-jack@suse.cz
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index c18cf5d..93fdaac 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3815,7 +3815,7 @@ retry:
                tag_pages_for_writeback(mapping, index, end);
        while (!done && !nr_to_write_done && (index <= end) &&
               (nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
-                       tag, PAGEVEC_SIZE))) {
+                       tag))) {
                unsigned i;
 
                scanned = 1;
@@ -3956,8 +3956,8 @@ retry:
                tag_pages_for_writeback(mapping, index, end);
        done_index = index;
        while (!done && !nr_to_write_done && (index <= end) &&
-              (nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
-                       tag, PAGEVEC_SIZE))) {
+                       (nr_pages = pagevec_lookup_range_tag(&pvec, mapping,
+                                               &index, end, tag))) {
                unsigned i;
 
                scanned = 1;

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 0fc2987..26c682d 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1162,8 +1162,7 @@ release_pvec_pages:
                        index = 0;
                        while ((index <= end) &&
                               (nr = pagevec_lookup_tag(&pvec, mapping, &index,
-                                                       PAGECACHE_TAG_WRITEBACK,
-                                                       PAGEVEC_SIZE))) {
+                                               PAGECACHE_TAG_WRITEBACK))) {
                                for (i = 0; i < nr; i++) {
                                        page = pvec.pages[i];
                                        if (page_snap_context(page) != snapc)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3d0708c..b239a41 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2621,7 +2621,7 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)
        mpd->next_page = index;
        while (index <= end) {
                nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
-                               tag, PAGEVEC_SIZE);
+                               tag);
                if (nr_pages == 0)
                        goto out;
 

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index fb74ec4..6124f87 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -319,7 +319,7 @@ long sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,
        blk_start_plug(&plug);
 
        while ((nr_pages = pagevec_lookup_tag(&pvec, mapping, &index,
-                               PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
+                               PAGECACHE_TAG_DIRTY))) {
                int i;
 
                for (i = 0; i < nr_pages; i++) {

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 17d2c29..6877037 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1670,7 +1670,7 @@ retry:
                int i;
 
                nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
-                               tag, PAGEVEC_SIZE);
+                               tag);
                if (nr_pages == 0)
                        break;
 

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index ca020e7..d6e4df0 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1286,7 +1286,7 @@ static struct page *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino)
        index = 0;
 
        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                               PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
+                               PAGECACHE_TAG_DIRTY))) {
                int i;
 
                for (i = 0; i < nr_pages; i++) {
@@ -1440,7 +1440,7 @@ retry:
        index = 0;
 
        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                               PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
+                               PAGECACHE_TAG_DIRTY))) {
                int i;
 
                for (i = 0; i < nr_pages; i++) {
@@ -1553,7 +1553,7 @@ next_step:
        index = 0;
 
        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                               PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))) {
+                               PAGECACHE_TAG_DIRTY))) {
                int i;
 
                for (i = 0; i < nr_pages; i++) {
@@ -1651,7 +1651,7 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino)
        pagevec_init(&pvec, 0);
 
        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                               PAGECACHE_TAG_WRITEBACK, PAGEVEC_SIZE))) {
+                               PAGECACHE_TAG_WRITEBACK))) {
                int i;
 
                for (i = 0; i < nr_pages; i++) {

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index d0848d9..3fea3d7 100644 (file)
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -398,7 +398,7 @@ retry:
        done_index = index;
        while (!done && (index <= end)) {
                nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
-                               tag, PAGEVEC_SIZE);
+                               tag);
                if (nr_pages == 0)
                        break;
 

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 06ffa13..35989c7 100644 (file)
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -2158,8 +2158,8 @@ static void nilfs_btree_lookup_dirty_buffers(struct nilfs_bmap *btree,
 
        pagevec_init(&pvec, 0);
 
-       while (pagevec_lookup_tag(&pvec, btcache, &index, PAGECACHE_TAG_DIRTY,
-                                 PAGEVEC_SIZE)) {
+       while (pagevec_lookup_tag(&pvec, btcache, &index,
+                                       PAGECACHE_TAG_DIRTY)) {
                for (i = 0; i < pagevec_count(&pvec); i++) {
                        bh = head = page_buffers(pvec.pages[i]);
                        do {

diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 8616c46..1c16726 100644 (file)
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -257,8 +257,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap,
 
        pagevec_init(&pvec, 0);
 repeat:
-       if (!pagevec_lookup_tag(&pvec, smap, &index, PAGECACHE_TAG_DIRTY,
-                               PAGEVEC_SIZE))
+       if (!pagevec_lookup_tag(&pvec, smap, &index, PAGECACHE_TAG_DIRTY))
                return 0;
 
        for (i = 0; i < pagevec_count(&pvec); i++) {
@@ -376,8 +375,8 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent)
 
        pagevec_init(&pvec, 0);
 
-       while (pagevec_lookup_tag(&pvec, mapping, &index, PAGECACHE_TAG_DIRTY,
-                                 PAGEVEC_SIZE)) {
+       while (pagevec_lookup_tag(&pvec, mapping, &index,
+                                       PAGECACHE_TAG_DIRTY)) {
                for (i = 0; i < pagevec_count(&pvec); i++) {
                        struct page *page = pvec.pages[i];
 

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 68e5769..19366ab 100644 (file)
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -712,7 +712,7 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,
  repeat:
        if (unlikely(index > last) ||
            !pagevec_lookup_range_tag(&pvec, mapping, &index, last,
-                               PAGECACHE_TAG_DIRTY, PAGEVEC_SIZE))
+                               PAGECACHE_TAG_DIRTY))
                return ndirties;
 
        for (i = 0; i < pagevec_count(&pvec); i++) {
@@ -755,8 +755,8 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode,
 
        pagevec_init(&pvec, 0);
 
-       while (pagevec_lookup_tag(&pvec, mapping, &index, PAGECACHE_TAG_DIRTY,
-                                 PAGEVEC_SIZE)) {
+       while (pagevec_lookup_tag(&pvec, mapping, &index,
+                                       PAGECACHE_TAG_DIRTY)) {
                for (i = 0; i < pagevec_count(&pvec); i++) {
                        bh = head = page_buffers(pvec.pages[i]);
                        do {

diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
index 87a2dfd..4f56e0a 100644 (file)
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@ -40,16 +40,14 @@ static inline unsigned pagevec_lookup(struct pagevec *pvec,
 
 unsigned pagevec_lookup_range_tag(struct pagevec *pvec,
                struct address_space *mapping, pgoff_t *index, pgoff_t end,
-               int tag, unsigned nr_pages);
+               int tag);
 unsigned pagevec_lookup_range_nr_tag(struct pagevec *pvec,
                struct address_space *mapping, pgoff_t *index, pgoff_t end,
                int tag, unsigned max_pages);
 static inline unsigned pagevec_lookup_tag(struct pagevec *pvec,
-               struct address_space *mapping, pgoff_t *index, int tag,
-               unsigned nr_pages)
+               struct address_space *mapping, pgoff_t *index, int tag)
 {
-       return pagevec_lookup_range_tag(pvec, mapping, index, (pgoff_t)-1, tag,
-                                       nr_pages);
+       return pagevec_lookup_range_tag(pvec, mapping, index, (pgoff_t)-1, tag);
 }
 
 static inline void pagevec_init(struct pagevec *pvec, int cold)

diff --git a/mm/filemap.c b/mm/filemap.c
index 229481d..6eb4e32 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -424,7 +424,7 @@ static void __filemap_fdatawait_range(struct address_space *mapping,
                unsigned i;
 
                nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index,
-                               end, PAGECACHE_TAG_WRITEBACK, PAGEVEC_SIZE);
+                               end, PAGECACHE_TAG_WRITEBACK);
                if (!nr_pages)
                        break;
 

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 460fc02..231651a 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2197,7 +2197,7 @@ retry:
                int i;
 
                nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
-                               tag, PAGEVEC_SIZE);
+                               tag);
                if (nr_pages == 0)
                        break;
 

diff --git a/mm/swap.c b/mm/swap.c
index 6c50fec..4edac53 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -988,10 +988,10 @@ EXPORT_SYMBOL(pagevec_lookup_range);
 
 unsigned pagevec_lookup_range_tag(struct pagevec *pvec,
                struct address_space *mapping, pgoff_t *index, pgoff_t end,
-               int tag, unsigned nr_pages)
+               int tag)
 {
        pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
-                                       nr_pages, pvec->pages);
+                                       PAGEVEC_SIZE, pvec->pages);
        return pagevec_count(pvec);
 }
 EXPORT_SYMBOL(pagevec_lookup_range_tag);