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 <darrick.wong@xxxxxxxxxx>
CC: linux-xfs@xxxxxxxxxxxxxxx
Signed-off-by: Jan Kara <jack@xxxxxxx>
---
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
