iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: use pagevec_lookup_range_tag()

Browse Source 
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>
This commit is contained in:
Jan Kara 2017-11-15 17:34:41 -08:00 committed by Linus Torvalds
parent 4006f437f9
commit 0ed75fc8d2
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/ceph/addr.c
View File

@ -872,13 +872,10 @@ retry:
get_more_pages: get_more_pages:
pvec_pages = min_t(unsigned, PAGEVEC_SIZE, pvec_pages = min_t(unsigned, PAGEVEC_SIZE,
max_pages - locked_pages); max_pages - locked_pages);
if (end - index < (u64)(pvec_pages - 1)) pvec_pages = pagevec_lookup_range_tag(&pvec, mapping, &index,
pvec_pages = (unsigned)(end - index) + 1; end, PAGECACHE_TAG_DIRTY,
pvec_pages = pagevec_lookup_tag(&pvec, mapping, &index,
PAGECACHE_TAG_DIRTY,
pvec_pages); 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) if (!pvec_pages && !locked_pages)
break; break;
for (i = 0; i < pvec_pages && locked_pages < max_pages; i++) { for (i = 0; i < pvec_pages && locked_pages < max_pages; i++) {
@ -896,16 +893,6 @@ get_more_pages:
unlock_page(page); unlock_page(page);
continue; 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)) { if (strip_unit_end && (page->index > strip_unit_end)) {
dout("end of strip unit %p\n", page); dout("end of strip unit %p\n", page);
unlock_page(page); unlock_page(page);