On Wed 19-08-20 16:05:53, Matthew Wilcox (Oracle) wrote: > All callers want to fetch the full size of the pvec. > > Signed-off-by: Matthew Wilcox (Oracle) <[email protected]>
Looks good to me. You can add: Reviewed-by: Jan Kara <[email protected]> Honza > --- > include/linux/pagevec.h | 2 +- > mm/swap.c | 4 ++-- > mm/truncate.c | 10 ++++------ > 3 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h > index 4b245592262c..ce77724a2ab7 100644 > --- 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 b6e56a84b466..d4e3ba4c967c 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -1058,9 +1058,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 9c617291fb1e..96a45ba28042 100644 > --- a/mm/truncate.c > +++ b/mm/truncate.c > @@ -327,7 +327,7 @@ void truncate_inode_pages_range(struct address_space > *mapping, > pagevec_init(&pvec); > index = start; > while (pagevec_lookup_entries(&pvec, mapping, index, end - 1, > - PAGEVEC_SIZE, indices)) { > + indices)) { > /* > * Pagevec array has exceptional entries and we may also fail > * to lock some pages. So we store pages that can be deleted > @@ -411,7 +411,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; > @@ -540,8 +540,7 @@ unsigned long invalidate_mapping_pages(struct > address_space *mapping, > int i; > > pagevec_init(&pvec); > - 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]; > > @@ -680,8 +679,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]; > > -- > 2.28.0 > -- Jan Kara <[email protected]> SUSE Labs, CR
