The patch titled
Subject: mm: remove nr_entries parameter from pagevec_lookup_entries
has been removed from the -mm tree. Its filename was
mm-remove-nr_entries-parameter-from-pagevec_lookup_entries.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
Reviewed-by: William Kucharski <william.kucharski@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Cc: Dave Chinner <dchinner@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/pagevec.h | 2 +-
mm/swap.c | 4 ++--
mm/truncate.c | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
--- a/include/linux/pagevec.h~mm-remove-nr_entries-parameter-from-pagevec_lookup_entries
+++ a/include/linux/pagevec.h
@@ -27,7 +27,7 @@ void __pagevec_release(struct pagevec *p
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,
--- a/mm/swap.c~mm-remove-nr_entries-parameter-from-pagevec_lookup_entries
+++ a/mm/swap.c
@@ -1044,9 +1044,9 @@ void __pagevec_lru_add(struct pagevec *p
*/
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);
}
--- a/mm/truncate.c~mm-remove-nr_entries-parameter-from-pagevec_lookup_entries
+++ a/mm/truncate.c
@@ -377,7 +377,7 @@ void truncate_inode_pages_range(struct a
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;
@@ -638,8 +638,7 @@ int invalidate_inode_pages2_range(struct
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];
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
