mm: add variant of pagevec_lookup_range_tag() taking number of pages

[sfrench/cifs-2.6.git] / mm / swap.c

diff --git a/mm/swap.c b/mm/swap.c
index a77d68f2c1b61de1bc8102656e7e482a442963b1..6c50fec2da9291148c809d85d04d4aad6c94959b 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -986,15 +986,25 @@ unsigned pagevec_lookup_range(struct pagevec *pvec,
 }
 EXPORT_SYMBOL(pagevec_lookup_range);
 
-unsigned pagevec_lookup_tag(struct pagevec *pvec, struct address_space *mapping,
-               pgoff_t *index, int tag, unsigned nr_pages)
+unsigned pagevec_lookup_range_tag(struct pagevec *pvec,
+               struct address_space *mapping, pgoff_t *index, pgoff_t end,
+               int tag, unsigned nr_pages)
 {
-       pvec->nr = find_get_pages_tag(mapping, index, tag,
+       pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
                                        nr_pages, pvec->pages);
        return pagevec_count(pvec);
 }
-EXPORT_SYMBOL(pagevec_lookup_tag);
+EXPORT_SYMBOL(pagevec_lookup_range_tag);
 
+unsigned pagevec_lookup_range_nr_tag(struct pagevec *pvec,
+               struct address_space *mapping, pgoff_t *index, pgoff_t end,
+               int tag, unsigned max_pages)
+{
+       pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
+               min_t(unsigned int, max_pages, PAGEVEC_SIZE), pvec->pages);
+       return pagevec_count(pvec);
+}
+EXPORT_SYMBOL(pagevec_lookup_range_nr_tag);
 /*
  * Perform any setup for the swap system
  */