[PATCH 10/35] ext4: Use pagevec_lookup_range() in writeback code

[Jan Kara]

Both occurences of pagevec_lookup() actually want only pages from a
given range. Use pagevec_lookup_range() for the lookup.

CC: "Theodore Ts'o" <ty...@mit.edu>
CC: linux-e...@vger.kernel.org
Signed-off-by: Jan Kara <j...@suse.cz>
---
 fs/ext4/inode.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 784f41328dc8..59d82530d269 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1670,13 +1670,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) {
@@ -2283,15 +2283,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;
                        bh = head = page_buffers(page);
                        do {
                                if (lblk < mpd->map.m_lblk)
-- 
2.12.3

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html