korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 20:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mm: remove pagevec_lookup_entries

Browse Source 
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: 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>
This commit is contained in:
Matthew Wilcox (Oracle) 2021-02-25 17:16:14 -08:00 committed by Linus Torvalds
parent cf2039af1a
commit a656a20241
3 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/pagevec.h
View File

@ -25,9 +25,6 @@ struct pagevec {
void __pagevec_release(struct pagevec *pvec); void __pagevec_release(struct pagevec *pvec);
void __pagevec_lru_add(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); void pagevec_remove_exceptionals(struct pagevec *pvec);
unsigned pagevec_lookup_range(struct pagevec *pvec, unsigned pagevec_lookup_range(struct pagevec *pvec,
struct address_space *mapping, struct address_space *mapping,

36
mm/swap.c
View File

@ -1017,44 +1017,12 @@ void __pagevec_lru_add(struct pagevec *pvec)
pagevec_reinit(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 * pagevec_remove_exceptionals - pagevec exceptionals pruning
* @pvec: The pagevec to prune * @pvec: The pagevec to prune
* *
* pagevec_lookup_entries() fills both pages and exceptional radix * find_get_entries() fills both pages and XArray value entries (aka
* tree entries into the pagevec. This function prunes all * exceptional entries) into the pagevec. This function prunes all
* exceptionals from @pvec without leaving holes, so that it can be * exceptionals from @pvec without leaving holes, so that it can be
* passed on to page-only pagevec operations. * passed on to page-only pagevec operations.
*/ */

4
mm/truncate.c
View File

@ -376,7 +376,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
index = start; index = start;
for ( ; ; ) { for ( ; ; ) {
cond_resched(); cond_resched();
if (!pagevec_lookup_entries(&pvec, mapping, index, end - 1, if (!find_get_entries(mapping, index, end - 1, &pvec,
indices)) { indices)) {
/* If all gone from start onwards, we're done */ /* If all gone from start onwards, we're done */
if (index == start) if (index == start)
@ -638,7 +638,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
pagevec_init(&pvec); pagevec_init(&pvec);
index = start; 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++) { for (i = 0; i < pagevec_count(&pvec); i++) {
struct page *page = pvec.pages[i]; struct page *page = pvec.pages[i];