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-29-jack@suse.cz> Date: Thu, 1 Jun 2017 11:32:38 +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 28/35] shmem: Use pagevec_lookup_entries() Currently we use find_get_entries() shmem which just opencode what pagevec_lookup_entries() does. Use pagevec_lookup_entries() instead except for one case which plays tricks with number of pages looked up and it won't fit in how we will make pagevec_lookup_entries() work. CC: Hugh Dickins <hughd@...gle.com> Signed-off-by: Jan Kara <jack@...e.cz> --- mm/shmem.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index a614a9cfb58c..8a6fddec27a1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -768,10 +768,9 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, pagevec_init(&pvec, 0); index = start; while (index < end) { - pvec.nr = find_get_entries(mapping, index, - min(end - index, (pgoff_t)PAGEVEC_SIZE), - pvec.pages, indices); - if (!pvec.nr) + if (!pagevec_lookup_entries(&pvec, mapping, index, + min(end - index, (pgoff_t)PAGEVEC_SIZE), + indices)) break; for (i = 0; i < pagevec_count(&pvec); i++) { struct page *page = pvec.pages[i]; @@ -859,10 +858,9 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, while (index < end) { cond_resched(); - pvec.nr = find_get_entries(mapping, index, + if (!pagevec_lookup_entries(&pvec, mapping, index, min(end - index, (pgoff_t)PAGEVEC_SIZE), - pvec.pages, indices); - if (!pvec.nr) { + indices)) { /* If all gone or hole-punch or unfalloc, we're done */ if (index == start || end != -1) break; -- 2.12.3
Powered by blists - more mailing lists