Commit 2b85a617 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds

ext4: use pagevec_lookup_range() in writeback code

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

Link: http://lkml.kernel.org/r/20170726114704.7626-7-jack@suse.czSigned-off-by: default avatarJan Kara <jack@suse.cz>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dec0da7b
...@@ -1720,13 +1720,13 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd, ...@@ -1720,13 +1720,13 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,
pagevec_init(&pvec, 0); pagevec_init(&pvec, 0);
while (index <= end) { 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) if (nr_pages == 0)
break; break;
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
struct page *page = pvec.pages[i]; struct page *page = pvec.pages[i];
if (page->index > end)
break;
BUG_ON(!PageLocked(page)); BUG_ON(!PageLocked(page));
BUG_ON(PageWriteback(page)); BUG_ON(PageWriteback(page));
if (invalidate) { if (invalidate) {
...@@ -2347,15 +2347,13 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd) ...@@ -2347,15 +2347,13 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)
pagevec_init(&pvec, 0); pagevec_init(&pvec, 0);
while (start <= end) { while (start <= end) {
nr_pages = pagevec_lookup(&pvec, inode->i_mapping, &start, nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping,
PAGEVEC_SIZE); &start, end, PAGEVEC_SIZE);
if (nr_pages == 0) if (nr_pages == 0)
break; break;
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
struct page *page = pvec.pages[i]; struct page *page = pvec.pages[i];
if (page->index > end)
break;
bh = head = page_buffers(page); bh = head = page_buffers(page);
do { do {
if (lblk < mpd->map.m_lblk) if (lblk < mpd->map.m_lblk)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment