1 files changed, 5 insertions, 15 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 2633150e41b9..8d2b582fb141 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1719,7 +1719,7 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,
                 ext4_es_remove_extent(inode, start, last - start + 1);
         }
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         while (index <= end) {
                 nr_pages = pagevec_lookup_range(&pvec, mapping, &index, end);
                 if (nr_pages == 0)
@@ -2345,7 +2345,7 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)
         lblk = start << bpp_bits;
         pblock = mpd->map.m_pblk;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         while (start <= end) {
                 nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping,
                                                 &start, end);
@@ -2616,12 +2616,12 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)
         else
                 tag = PAGECACHE_TAG_DIRTY;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         mpd->map.m_len = 0;
         mpd->next_page = index;
         while (index <= end) {
-                nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag,
-                              min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1);
+                nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
+                                tag);
                 if (nr_pages == 0)
                         goto out;
 
@@ -2629,16 +2629,6 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)
                         struct page *page = pvec.pages[i];
 
                         /*
-                         * At this point, the page may be truncated or
-                         * invalidated (changing page->mapping to NULL), or
-                         * even swizzled back from swapper_space to tmpfs file
-                         * mapping. However, page->index will not change
-                         * because we have a reference on the page.
-                         */
-                        if (page->index > end)
-                                goto out;
-
-                        /*
                          * Accumulated enough dirty pages? This doesn't apply
                          * to WB_SYNC_ALL mode. For integrity sync we have to
                          * keep going because someone may be concurrently