mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
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>
This commit is contained in:
parent
31d270fd98
commit
38cefeb337
3 changed files with 5 additions and 6 deletions
|
@ -27,7 +27,7 @@ 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,
|
unsigned pagevec_lookup_entries(struct pagevec *pvec,
|
||||||
struct address_space *mapping, pgoff_t start, pgoff_t end,
|
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);
|
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,
|
||||||
|
|
|
@ -1044,9 +1044,9 @@ void __pagevec_lru_add(struct pagevec *pvec)
|
||||||
*/
|
*/
|
||||||
unsigned pagevec_lookup_entries(struct pagevec *pvec,
|
unsigned pagevec_lookup_entries(struct pagevec *pvec,
|
||||||
struct address_space *mapping, pgoff_t start, pgoff_t end,
|
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);
|
pvec->pages, indices);
|
||||||
return pagevec_count(pvec);
|
return pagevec_count(pvec);
|
||||||
}
|
}
|
||||||
|
|
|
@ -377,7 +377,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
|
||||||
for ( ; ; ) {
|
for ( ; ; ) {
|
||||||
cond_resched();
|
cond_resched();
|
||||||
if (!pagevec_lookup_entries(&pvec, mapping, index, end - 1,
|
if (!pagevec_lookup_entries(&pvec, mapping, index, end - 1,
|
||||||
PAGEVEC_SIZE, 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)
|
||||||
break;
|
break;
|
||||||
|
@ -638,8 +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,
|
while (pagevec_lookup_entries(&pvec, mapping, index, end, indices)) {
|
||||||
PAGEVEC_SIZE, 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];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue