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

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

ceph: use pagevec_lookup_range_tag() 

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

Link: http://lkml.kernel.org/r/20171009151359.31984-4-jack@suse.cz


Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4006f437

fs/ceph/addr.c

+3 −16
Original line number Diff line number Diff line
@@ -872,13 +872,10 @@ static int ceph_writepages_start(struct address_space *mapping, 
get_more_pages:

		pvec_pages = min_t(unsigned, PAGEVEC_SIZE,

				   max_pages - locked_pages);

		if (end - index < (u64)(pvec_pages - 1))

			pvec_pages = (unsigned)(end - index) + 1;



		pvec_pages = pagevec_lookup_tag(&pvec, mapping, &index,

						PAGECACHE_TAG_DIRTY,

		pvec_pages = pagevec_lookup_range_tag(&pvec, mapping, &index,

						end, PAGECACHE_TAG_DIRTY,

						pvec_pages);

		dout("pagevec_lookup_tag got %d\n", pvec_pages);

		dout("pagevec_lookup_range_tag got %d\n", pvec_pages);

		if (!pvec_pages && !locked_pages)

			break;

		for (i = 0; i < pvec_pages && locked_pages < max_pages; i++) {
@@ -896,16 +893,6 @@ static int ceph_writepages_start(struct address_space *mapping, 
				unlock_page(page);

				continue;

			}

			if (page->index > end) {

				dout("end of range %p\n", page);

				/* can't be range_cyclic (1st pass) because

				 * end == -1 in that case. */

				stop = true;

				if (ceph_wbc.head_snapc)

					done = true;

				unlock_page(page);

				break;

			}

			if (strip_unit_end && (page->index > strip_unit_end)) {

				dout("end of strip unit %p\n", page);

				unlock_page(page);