lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20170601093245.29238-13-jack@suse.cz> Date: Thu, 1 Jun 2017 11:32:22 +0200 From: Jan Kara <jack@...e.cz> To: <linux-mm@...ck.org> Cc: Hugh Dickins <hughd@...gle.com>, David Howells <dhowells@...hat.com>, linux-afs@...ts.infradead.org, Ryusuke Konishi <konishi.ryusuke@....ntt.co.jp>, linux-nilfs@...r.kernel.org, Bob Peterson <rpeterso@...hat.com>, cluster-devel@...hat.com, Jaegeuk Kim <jaegeuk@...nel.org>, linux-f2fs-devel@...ts.sourceforge.net, tytso@....edu, linux-ext4@...r.kernel.org, Ilya Dryomov <idryomov@...il.com>, "Yan, Zheng" <zyan@...hat.com>, ceph-devel@...r.kernel.org, linux-btrfs@...r.kernel.org, David Sterba <dsterba@...e.com>, "Darrick J . Wong" <darrick.wong@...cle.com>, linux-xfs@...r.kernel.org, Nadia Yvette Chambers <nyc@...omorphy.com>, Jan Kara <jack@...e.cz> Subject: [PATCH 12/35] xfs: Use pagevec_lookup_range() in xfs_find_get_desired_pgoff() 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@...cle.com> CC: linux-xfs@...r.kernel.org Signed-off-by: Jan Kara <jack@...e.cz> --- 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
Powered by blists - more mailing lists