From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: [PATCH 23/35] mm: Use pagevec_lookup_range_tag() in __filemap_fdatawait_range() Date: Thu, 1 Jun 2017 11:32:33 +0200 Message-ID: <20170601093245.29238-24-jack@suse.cz> References: <20170601093245.29238-1-jack@suse.cz> Return-path: DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6A09878EC3 DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0ED5380E79 In-Reply-To: <20170601093245.29238-1-jack@suse.cz> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: cluster-devel-bounces@redhat.com Errors-To: cluster-devel-bounces@redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mm@kvack.org Cc: cluster-devel@redhat.com, linux-nilfs@vger.kernel.org, tytso@mit.edu, linux-xfs@vger.kernel.org, "Yan, Zheng" , Jan Kara , "Darrick J . Wong" , Hugh Dickins , linux-f2fs-devel@lists.sourceforge.net, David Howells , David Sterba , ceph-devel@vger.kernel.org, Nadia Yvette Chambers , Ryusuke Konishi , Jaegeuk Kim , Ilya Dryomov , linux-ext4@vger.kernel.org, linux-afs@lists.infradead.org, linux-btrfs@vger.kernel.org Use pagevec_lookup_range_tag() in __filemap_fdatawait_range() as it is interested only in pages from given range. Remove unnecessary code resulting from this. Signed-off-by: Jan Kara --- mm/filemap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 56af68f6a375..8039b6bb9c27 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -390,18 +390,13 @@ static int __filemap_fdatawait_range(struct address_space *mapping, pagevec_init(&pvec, 0); while ((index <= end) && - (nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, - PAGECACHE_TAG_WRITEBACK, - min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1)) != 0) { + (nr_pages = pagevec_lookup_range_tag(&pvec, mapping, + &index, end, PAGECACHE_TAG_WRITEBACK, PAGEVEC_SIZE))) { unsigned i; for (i = 0; i < nr_pages; i++) { struct page *page = pvec.pages[i]; - /* until radix tree lookup accepts end_index */ - if (page->index > end) - continue; - wait_on_page_writeback(page); if (TestClearPageError(page)) ret = -EIO; -- 2.12.3