Commit dc7f3e86 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds

ext4: use pagevec_lookup_range_tag()

We want only pages from given range in ext4_writepages().  Use
pagevec_lookup_range_tag() instead of pagevec_lookup_tag() and remove
unnecessary code.

Link: http://lkml.kernel.org/r/20171009151359.31984-5-jack@suse.czSigned-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
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 0ed75fc8
...@@ -2620,24 +2620,14 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) ...@@ -2620,24 +2620,14 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)
mpd->map.m_len = 0; mpd->map.m_len = 0;
mpd->next_page = index; mpd->next_page = index;
while (index <= end) { while (index <= end) {
nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag, nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end,
min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1); tag, PAGEVEC_SIZE);
if (nr_pages == 0) if (nr_pages == 0)
goto out; goto out;
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];
/*
* 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 * Accumulated enough dirty pages? This doesn't apply
* to WB_SYNC_ALL mode. For integrity sync we have to * to WB_SYNC_ALL mode. For integrity sync we have to
......
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