Skip to content

Commit

Permalink
ceph: use pagevec_lookup_range_tag()
Browse files Browse the repository at this point in the history
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: Jan Kara <jack@suse.cz>
Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jan Kara authored and Linus Torvalds committed Nov 16, 2017
1 parent 4006f43 commit 0ed75fc
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions fs/ceph/addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand All @@ -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);
Expand Down

0 comments on commit 0ed75fc

Please sign in to comment.