ext4: use pagevec_lookup_range() in writeback code

[sfrench/cifs-2.6.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c774bdc22759b1602341da70a0b3fec7b8830f2c..6103ce0430dfc07f5f5a434ce159c3ed8b6e80d5 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1720,13 +1720,13 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,
 
        pagevec_init(&pvec, 0);
        while (index <= end) {
-               nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE);
+               nr_pages = pagevec_lookup_range(&pvec, mapping, &index, end,
+                                               PAGEVEC_SIZE);
                if (nr_pages == 0)
                        break;
                for (i = 0; i < nr_pages; i++) {
                        struct page *page = pvec.pages[i];
-                       if (page->index > end)
-                               break;
+
                        BUG_ON(!PageLocked(page));
                        BUG_ON(PageWriteback(page));
                        if (invalidate) {
@@ -1737,7 +1737,6 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,
                        }
                        unlock_page(page);
                }
-               index = pvec.pages[nr_pages - 1]->index + 1;
                pagevec_release(&pvec);
        }
 }
@@ -2348,17 +2347,13 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)
 
        pagevec_init(&pvec, 0);
        while (start <= end) {
-               nr_pages = pagevec_lookup(&pvec, inode->i_mapping, start,
-                                         PAGEVEC_SIZE);
+               nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping,
+                                               &start, end, PAGEVEC_SIZE);
                if (nr_pages == 0)
                        break;
                for (i = 0; i < nr_pages; i++) {
                        struct page *page = pvec.pages[i];
 
-                       if (page->index > end)
-                               break;
-                       /* Up to 'end' pages must be contiguous */
-                       BUG_ON(page->index != start);
                        bh = head = page_buffers(page);
                        do {
                                if (lblk < mpd->map.m_lblk)
@@ -2403,7 +2398,6 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)
                                pagevec_release(&pvec);
                                return err;
                        }
-                       start++;
                }
                pagevec_release(&pvec);
        }