On Wed 19-08-20 16:05:52, Matthew Wilcox (Oracle) wrote: > Simplifies the callers and uses the existing functionality of > find_get_entries(). > > Signed-off-by: Matthew Wilcox (Oracle) <[email protected]>
The patch looks good to me. You can add: Reviewed-by: Jan Kara <[email protected]> Honza > --- > include/linux/pagevec.h | 5 ++--- > mm/swap.c | 8 ++++---- > mm/truncate.c | 36 ++++++++---------------------------- > 3 files changed, 14 insertions(+), 35 deletions(-) > > diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h > index 081d934eda64..4b245592262c 100644 > --- a/include/linux/pagevec.h > +++ b/include/linux/pagevec.h > @@ -26,9 +26,8 @@ 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, unsigned nr_entries, > - pgoff_t *indices); > + struct address_space *mapping, pgoff_t start, pgoff_t end, > + unsigned nr_entries, 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 fcf6ccb94b09..b6e56a84b466 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -1036,6 +1036,7 @@ void __pagevec_lru_add(struct pagevec *pvec) > * @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 > * > @@ -1056,11 +1057,10 @@ void __pagevec_lru_add(struct pagevec *pvec) > * found. > */ > unsigned pagevec_lookup_entries(struct pagevec *pvec, > - struct address_space *mapping, > - pgoff_t start, unsigned nr_entries, > - pgoff_t *indices) > + struct address_space *mapping, pgoff_t start, pgoff_t end, > + unsigned nr_entries, pgoff_t *indices) > { > - pvec->nr = find_get_entries(mapping, start, ULONG_MAX, nr_entries, > + pvec->nr = find_get_entries(mapping, start, end, nr_entries, > pvec->pages, indices); > return pagevec_count(pvec); > } > diff --git a/mm/truncate.c b/mm/truncate.c > index dd9ebc1da356..9c617291fb1e 100644 > --- a/mm/truncate.c > +++ b/mm/truncate.c > @@ -326,9 +326,8 @@ void truncate_inode_pages_range(struct address_space > *mapping, > > pagevec_init(&pvec); > index = start; > - while (index < end && pagevec_lookup_entries(&pvec, mapping, index, > - min(end - index, (pgoff_t)PAGEVEC_SIZE), > - indices)) { > + while (pagevec_lookup_entries(&pvec, mapping, index, end - 1, > + PAGEVEC_SIZE, indices)) { > /* > * Pagevec array has exceptional entries and we may also fail > * to lock some pages. So we store pages that can be deleted > @@ -342,8 +341,6 @@ void truncate_inode_pages_range(struct address_space > *mapping, > > /* We rely upon deletion not changing page->index */ > index = indices[i]; > - if (index >= end) > - break; > > if (xa_is_value(page)) > continue; > @@ -413,8 +410,8 @@ void truncate_inode_pages_range(struct address_space > *mapping, > index = start; > for ( ; ; ) { > cond_resched(); > - if (!pagevec_lookup_entries(&pvec, mapping, index, > - min(end - index, (pgoff_t)PAGEVEC_SIZE), indices)) { > + if (!pagevec_lookup_entries(&pvec, mapping, index, end - 1, > + PAGEVEC_SIZE, indices)) { > /* If all gone from start onwards, we're done */ > if (index == start) > break; > @@ -422,23 +419,12 @@ void truncate_inode_pages_range(struct address_space > *mapping, > index = start; > continue; > } > - if (index == start && indices[0] >= end) { > - /* All gone out of hole to be punched, we're done */ > - pagevec_remove_exceptionals(&pvec); > - pagevec_release(&pvec); > - break; > - } > > for (i = 0; i < pagevec_count(&pvec); i++) { > struct page *page = pvec.pages[i]; > > /* We rely upon deletion not changing page->index */ > index = indices[i]; > - if (index >= end) { > - /* Restart punch to make sure all gone */ > - index = start - 1; > - break; > - } > > if (xa_is_value(page)) > continue; > @@ -554,16 +540,13 @@ unsigned long invalidate_mapping_pages(struct > address_space *mapping, > int i; > > pagevec_init(&pvec); > - while (index <= end && pagevec_lookup_entries(&pvec, mapping, index, > - min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1, > - indices)) { > + while (pagevec_lookup_entries(&pvec, mapping, index, end, > + PAGEVEC_SIZE, indices)) { > for (i = 0; i < pagevec_count(&pvec); i++) { > struct page *page = pvec.pages[i]; > > /* We rely upon deletion not changing page->index */ > index = indices[i]; > - if (index > end) > - break; > > if (xa_is_value(page)) { > invalidate_exceptional_entry(mapping, index, > @@ -697,16 +680,13 @@ int invalidate_inode_pages2_range(struct address_space > *mapping, > > pagevec_init(&pvec); > index = start; > - while (index <= end && pagevec_lookup_entries(&pvec, mapping, index, > - min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1, > - indices)) { > + while (pagevec_lookup_entries(&pvec, mapping, index, end, > + PAGEVEC_SIZE, indices)) { > for (i = 0; i < pagevec_count(&pvec); i++) { > struct page *page = pvec.pages[i]; > > /* We rely upon deletion not changing page->index */ > index = indices[i]; > - if (index > end) > - break; > > if (xa_is_value(page)) { > if (!invalidate_exceptional_entry2(mapping, > -- > 2.28.0 > -- Jan Kara <[email protected]> SUSE Labs, CR
