1 files changed, 14 insertions, 6 deletions

diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
index 2636c0c0f279..5fb6580f7f23 100644
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@ -17,7 +17,7 @@ struct address_space;
 
 struct pagevec {
         unsigned long nr;
-        unsigned long cold;
+        bool percpu_pvec_drained;
         struct page *pages[PAGEVEC_SIZE];
 };
 
@@ -38,14 +38,22 @@ static inline unsigned pagevec_lookup(struct pagevec *pvec,
         return pagevec_lookup_range(pvec, mapping, start, (pgoff_t)-1);
 }
 
-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 pagevec_lookup_range_nr_tag(struct pagevec *pvec,
+                struct address_space *mapping, pgoff_t *index, pgoff_t end,
+                int tag, unsigned max_pages);
+static inline unsigned pagevec_lookup_tag(struct pagevec *pvec,
+                struct address_space *mapping, pgoff_t *index, int tag)
+{
+        return pagevec_lookup_range_tag(pvec, mapping, index, (pgoff_t)-1, tag);
+}
 
-static inline void pagevec_init(struct pagevec *pvec, int cold)
+static inline void pagevec_init(struct pagevec *pvec)
 {
         pvec->nr = 0;
-        pvec->cold = cold;
+        pvec->percpu_pvec_drained = false;
 }
 
 static inline void pagevec_reinit(struct pagevec *pvec)