Commit 38cefeb3 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Reviewed-by: default avatarChristoph 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 31d270fd

include/linux/pagevec.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

mm/swap.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

mm/truncate.c

+2 −3
Original line number Diff line number Diff line
@@ -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];