Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.cz


Signed-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

fs/ext4/inode.c

+2 −12
Original line number Diff line number Diff line
@@ -2620,24 +2620,14 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd) 
	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, PAGEVEC_SIZE);

		if (nr_pages == 0)

			goto out;



		for (i = 0; i < nr_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

			 * to WB_SYNC_ALL mode. For integrity sync we have to