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

mm: remove pagevec_lookup_entries 

pagevec_lookup_entries() is now just a wrapper around find_get_entries()
so remove it and convert all its callers.

Link: https://lkml.kernel.org/r/20201112212641.27837-15-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 cf2039af

include/linux/pagevec.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ struct pagevec { 


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,

		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 −34
Original line number Diff line number Diff line
@@ -1017,44 +1017,12 @@ void __pagevec_lru_add(struct pagevec *pvec) 
	pagevec_reinit(pvec);

}



/**

 * pagevec_lookup_entries - gang pagecache lookup

 * @pvec:	Where the resulting entries are placed

 * @mapping:	The address_space to search

 * @start:	The starting entry index

 * @end:	The highest index to return (inclusive).

 * @nr_entries:	The maximum number of pages

 * @indices:	The cache indices corresponding to the entries in @pvec

 *

 * pagevec_lookup_entries() will search for and return a group of up

 * to @nr_pages pages and shadow entries in the mapping.  All

 * entries are placed in @pvec.  pagevec_lookup_entries() takes a

 * reference against actual pages in @pvec.

 *

 * The search returns a group of mapping-contiguous entries with

 * ascending indexes.  There may be holes in the indices due to

 * not-present entries.

 *

 * Only one subpage of a Transparent Huge Page is returned in one call:

 * allowing truncate_inode_pages_range() to evict the whole THP without

 * cycling through a pagevec of extra references.

 *

 * pagevec_lookup_entries() returns the number of entries which were

 * found.

 */

unsigned pagevec_lookup_entries(struct pagevec *pvec,

		struct address_space *mapping, pgoff_t start, pgoff_t end,

		pgoff_t *indices)

{

	return find_get_entries(mapping, start, end, pvec, indices);

}



/**

 * pagevec_remove_exceptionals - pagevec exceptionals pruning

 * @pvec:	The pagevec to prune

 *

 * pagevec_lookup_entries() fills both pages and exceptional radix

 * tree entries into the pagevec.  This function prunes all

 * find_get_entries() fills both pages and XArray value entries (aka

 * exceptional entries) into the pagevec.  This function prunes all

 * exceptionals from @pvec without leaving holes, so that it can be

 * passed on to page-only pagevec operations.

 */

mm/truncate.c

+2 −2
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ void truncate_inode_pages_range(struct address_space *mapping, 
	index = start;

	for ( ; ; ) {

		cond_resched();

		if (!pagevec_lookup_entries(&pvec, mapping, index, end - 1,

		if (!find_get_entries(mapping, index, end - 1, &pvec,

				indices)) {

			/* If all gone from start onwards, we're done */

			if (index == start)
@@ -638,7 +638,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping, 


	pagevec_init(&pvec);

	index = start;

	while (pagevec_lookup_entries(&pvec, mapping, index, end, indices)) {

	while (find_get_entries(mapping, index, end, &pvec, indices)) {

		for (i = 0; i < pagevec_count(&pvec); i++) {

			struct page *page = pvec.pages[i];