1 files changed, 6 insertions, 10 deletions

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 70ded52dc1dd..f65392fecb5c 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -708,21 +708,17 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,
                 index = start >> PAGE_SHIFT;
                 last = end >> PAGE_SHIFT;
         }
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
  repeat:
         if (unlikely(index > last) ||
-            !pagevec_lookup_tag(&pvec, mapping, &index, PAGECACHE_TAG_DIRTY,
-                                min_t(pgoff_t, last - index,
-                                      PAGEVEC_SIZE - 1) + 1))
+            !pagevec_lookup_range_tag(&pvec, mapping, &index, last,
+                                PAGECACHE_TAG_DIRTY))
                 return ndirties;
 
         for (i = 0; i < pagevec_count(&pvec); i++) {
                 struct buffer_head *bh, *head;
                 struct page *page = pvec.pages[i];
 
-                if (unlikely(page->index > last))
-                        break;
-
                 lock_page(page);
                 if (!page_has_buffers(page))
                         create_empty_buffers(page, i_blocksize(inode), 0);
@@ -757,10 +753,10 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode,
         unsigned int i;
         pgoff_t index = 0;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
 
-        while (pagevec_lookup_tag(&pvec, mapping, &index, PAGECACHE_TAG_DIRTY,
-                                  PAGEVEC_SIZE)) {
+        while (pagevec_lookup_tag(&pvec, mapping, &index,
+                                        PAGECACHE_TAG_DIRTY)) {
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         bh = head = page_buffers(pvec.pages[i]);
                         do {