mm: remove nr_entries parameter from pagevec_lookup_entries

All callers want to fetch the full size of the pvec.

Link: https://lkml.kernel.org/r/20201112212641.27837-13-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Yang Shi <yang.shi@linux.alibaba.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
index f70a9dc81504475447302a1cfcccab554cafc764..72c5ea2e708dbe609c33230805a43fbbcf64efff 100644 (file)
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@ -27,7 +27,7 @@ void __pagevec_release(struct pagevec *pvec);
 void __pagevec_lru_add(struct pagevec *pvec);
 unsigned pagevec_lookup_entries(struct pagevec *pvec,
                struct address_space *mapping, pgoff_t start, pgoff_t end,
-               unsigned nr_entries, pgoff_t *indices);
+               pgoff_t *indices);
 void pagevec_remove_exceptionals(struct pagevec *pvec);
 unsigned pagevec_lookup_range(struct pagevec *pvec,
                              struct address_space *mapping,

diff --git a/mm/swap.c b/mm/swap.c
index db8c354264a5993d664a638ea4bb37a2ff6666c1..cd9e1ed7e78fbe3600aaf749580c197683e968ca 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -1044,9 +1044,9 @@ void __pagevec_lru_add(struct pagevec *pvec)
  */
 unsigned pagevec_lookup_entries(struct pagevec *pvec,
                struct address_space *mapping, pgoff_t start, pgoff_t end,
-               unsigned nr_entries, pgoff_t *indices)
+               pgoff_t *indices)
 {
-       pvec->nr = find_get_entries(mapping, start, end, nr_entries,
+       pvec->nr = find_get_entries(mapping, start, end, PAGEVEC_SIZE,
                                    pvec->pages, indices);
        return pagevec_count(pvec);
 }

diff --git a/mm/truncate.c b/mm/truncate.c
index 60df23890c2d10ec469ad834c39650bda5f75274..41e7377ad58dd79af27fa6d517771a7aa0c717e8 100644 (file)
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -377,7 +377,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
        for ( ; ; ) {
                cond_resched();
                if (!pagevec_lookup_entries(&pvec, mapping, index, end - 1,
-                               PAGEVEC_SIZE, indices)) {
+                               indices)) {
                        /* If all gone from start onwards, we're done */
                        if (index == start)
                                break;
@@ -638,8 +638,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
 
        pagevec_init(&pvec);
        index = start;
-       while (pagevec_lookup_entries(&pvec, mapping, index, end,
-                       PAGEVEC_SIZE, indices)) {
+       while (pagevec_lookup_entries(&pvec, mapping, index, end, indices)) {
                for (i = 0; i < pagevec_count(&pvec); i++) {
                        struct page *page = pvec.pages[i];