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-16-jack@suse.cz> Date: Thu, 1 Jun 2017 11:32:25 +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 15/35] btrfs: Use pagevec_lookup_range_tag() We want only pages from given range in btree_write_cache_pages() and extent_write_cache_pages(). Use pagevec_lookup_range_tag() instead of pagevec_lookup_tag() and remove unnecessary code. CC: linux-btrfs@...r.kernel.org CC: David Sterba <dsterba@...e.com> Signed-off-by: Jan Kara <jack@...e.cz> --- fs/btrfs/extent_io.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index d8da3edf2ac3..6287eaba30ac 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3837,8 +3837,8 @@ int btree_write_cache_pages(struct address_space *mapping, if (wbc->sync_mode == WB_SYNC_ALL) tag_pages_for_writeback(mapping, index, end); while (!done && !nr_to_write_done && (index <= end) && - (nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag, - min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1))) { + (nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end, + tag, PAGEVEC_SIZE))) { unsigned i; scanned = 1; @@ -3848,11 +3848,6 @@ int btree_write_cache_pages(struct address_space *mapping, if (!PagePrivate(page)) continue; - if (!wbc->range_cyclic && page->index > end) { - done = 1; - break; - } - spin_lock(&mapping->private_lock); if (!PagePrivate(page)) { spin_unlock(&mapping->private_lock); @@ -3984,8 +3979,8 @@ static int extent_write_cache_pages(struct address_space *mapping, tag_pages_for_writeback(mapping, index, end); done_index = index; while (!done && !nr_to_write_done && (index <= end) && - (nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, tag, - min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1))) { + (nr_pages = pagevec_lookup_range_tag(&pvec, mapping, &index, end, + tag, PAGEVEC_SIZE))) { unsigned i; scanned = 1; @@ -4010,12 +4005,6 @@ static int extent_write_cache_pages(struct address_space *mapping, continue; } - if (!wbc->range_cyclic && page->index > end) { - done = 1; - unlock_page(page); - continue; - } - if (wbc->sync_mode != WB_SYNC_NONE) { if (PageWriteback(page)) flush_fn(data); -- 2.12.3
Powered by blists - more mailing lists