From: Jan Kara <jack@suse.cz>
Date: Thu, 16 Nov 2017 01:35:16 +0000 (-0800)
Subject: ceph: use pagevec_lookup_range_nr_tag()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4be90299a1693c2112edb20ca78d6cc9f2183326;p=openwrt%2Fstaging%2Fblogic.git

ceph: use pagevec_lookup_range_nr_tag()

Use new function for looking up pages since nr_pages argument from
pagevec_lookup_range_tag() is going away.

Link: http://lkml.kernel.org/r/20171009151359.31984-14-jack@suse.cz
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 1af5cc899cb4..0fc2987cb62d 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -870,11 +870,9 @@ retry:
 		max_pages = wsize >> PAGE_SHIFT;
 
 get_more_pages:
-		pvec_pages = min_t(unsigned, PAGEVEC_SIZE,
-				   max_pages - locked_pages);
-		pvec_pages = pagevec_lookup_range_tag(&pvec, mapping, &index,
+		pvec_pages = pagevec_lookup_range_nr_tag(&pvec, mapping, &index,
 						end, PAGECACHE_TAG_DIRTY,
-						pvec_pages);
+						max_pages - locked_pages);
 		dout("pagevec_lookup_range_tag got %d\n", pvec_pages);
 		if (!pvec_pages && !locked_pages)
 			break;