1 files changed, 27 insertions, 46 deletions

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index fca87835a1da..b33dac9592ca 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1277,21 +1277,17 @@ release_page:
 
 static struct page *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino)
 {
-        pgoff_t index, end;
+        pgoff_t index;
         struct pagevec pvec;
         struct page *last_page = NULL;
+        int nr_pages;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         index = 0;
-        end = ULONG_MAX;
-
-        while (index <= end) {
-                int i, nr_pages;
-                nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                                PAGECACHE_TAG_DIRTY,
-                                min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1);
-                if (nr_pages == 0)
-                        break;
+
+        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
+                                PAGECACHE_TAG_DIRTY))) {
+                int i;
 
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
@@ -1425,13 +1421,14 @@ static int f2fs_write_node_page(struct page *page,
 int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
                         struct writeback_control *wbc, bool atomic)
 {
-        pgoff_t index, end;
+        pgoff_t index;
         pgoff_t last_idx = ULONG_MAX;
         struct pagevec pvec;
         int ret = 0;
         struct page *last_page = NULL;
         bool marked = false;
         nid_t ino = inode->i_ino;
+        int nr_pages;
 
         if (atomic) {
                 last_page = last_fsync_dnode(sbi, ino);
@@ -1439,17 +1436,12 @@ int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
                         return PTR_ERR_OR_ZERO(last_page);
         }
 retry:
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         index = 0;
-        end = ULONG_MAX;
-
-        while (index <= end) {
-                int i, nr_pages;
-                nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                                PAGECACHE_TAG_DIRTY,
-                                min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1);
-                if (nr_pages == 0)
-                        break;
+
+        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
+                                PAGECACHE_TAG_DIRTY))) {
+                int i;
 
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
@@ -1548,25 +1540,21 @@ out:
 int sync_node_pages(struct f2fs_sb_info *sbi, struct writeback_control *wbc,
                                 bool do_balance, enum iostat_type io_type)
 {
-        pgoff_t index, end;
+        pgoff_t index;
         struct pagevec pvec;
         int step = 0;
         int nwritten = 0;
         int ret = 0;
+        int nr_pages;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
 
 next_step:
         index = 0;
-        end = ULONG_MAX;
-
-        while (index <= end) {
-                int i, nr_pages;
-                nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                                PAGECACHE_TAG_DIRTY,
-                                min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1);
-                if (nr_pages == 0)
-                        break;
+
+        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
+                                PAGECACHE_TAG_DIRTY))) {
+                int i;
 
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
@@ -1655,27 +1643,20 @@ out:
 
 int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino)
 {
-        pgoff_t index = 0, end = ULONG_MAX;
+        pgoff_t index = 0;
         struct pagevec pvec;
         int ret2, ret = 0;
+        int nr_pages;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
 
-        while (index <= end) {
-                int i, nr_pages;
-                nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
-                                PAGECACHE_TAG_WRITEBACK,
-                                min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1);
-                if (nr_pages == 0)
-                        break;
+        while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index,
+                                PAGECACHE_TAG_WRITEBACK))) {
+                int i;
 
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
 
-                        /* until radix tree lookup accepts end_index */
-                        if (unlikely(page->index > end))
-                                continue;
-
                         if (ino && ino_of_node(page) == ino) {
                                 f2fs_wait_on_page_writeback(page, NODE, true);
                                 if (TestClearPageError(page))