From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: [PATCH 12/35] xfs: Use pagevec_lookup_range() in xfs_find_get_desired_pgoff() Date: Thu, 1 Jun 2017 11:32:22 +0200 Message-ID: <20170601093245.29238-13-jack@suse.cz> References: <20170601093245.29238-1-jack@suse.cz> Return-path: DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2DC2919C632 DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 045AD81F01 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 We want only pages from given range in xfs_find_get_desired_pgoff(). Use pagevec_lookup_range() instead of pagevec_lookup() and remove unnecessary code. Note that the check for getting less pages than desired can be removed because index gets updated by pagevec_lookup_range(). CC: Darrick J. Wong CC: linux-xfs@vger.kernel.org Signed-off-by: Jan Kara --- fs/xfs/xfs_file.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 487342078fc7..f9343dac7ff9 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -1045,13 +1045,11 @@ xfs_find_get_desired_pgoff( endoff = XFS_FSB_TO_B(mp, map->br_startoff + map->br_blockcount); end = (endoff - 1) >> PAGE_SHIFT; do { - int want; unsigned nr_pages; unsigned int i; - want = min_t(pgoff_t, end - index, PAGEVEC_SIZE - 1) + 1; - nr_pages = pagevec_lookup(&pvec, inode->i_mapping, &index, - want); + nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, + &index, end, PAGEVEC_SIZE); if (nr_pages == 0) break; @@ -1075,9 +1073,6 @@ xfs_find_get_desired_pgoff( *offset = lastoff; goto out; } - /* Searching done if the page index is out of range. */ - if (page->index > end) - goto out; lock_page(page); /* @@ -1117,13 +1112,6 @@ xfs_find_get_desired_pgoff( unlock_page(page); } - /* - * The number of returned pages less than our desired, search - * done. - */ - if (nr_pages < want) - break; - pagevec_release(&pvec); } while (index <= end); -- 2.12.3