1 files changed, 2 insertions, 6 deletions

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 70ded52dc1dd..68e5769cef3b 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -711,18 +711,14 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode,
         pagevec_init(&pvec, 0);
  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, PAGEVEC_SIZE))
                 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);