From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH v11 56/63] dax: Convert __dax_invalidate_entry to XArray Date: Sat, 14 Apr 2018 07:13:09 -0700 Message-ID: <20180414141316.7167-57-willy@infradead.org> References: <20180414141316.7167-1-willy@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QHlUY1Jc6CgLgtxrc+iSg/6ndpWn0vz6Z2ZUN5umMAI=; b=Gj5iIMPF2wNldXpysWdiY5YdgU 5Sn0O+4mk1TOJUUG/nP3sIL52SLaLrnoUVzuoWow7dpticDu9LKlqg60nqs0dpTdNqn86EQVivCxE 9yc8a2CuOMnMAvGteZbV4gbTp0BsJcjIZlZY68GzrMZQty1bIdrAWw6ehG2RkpPXlTgg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=QHlUY1Jc6CgLgtxrc+iSg/6ndpWn0vz6Z2ZUN5umMAI=; b=c0BY4wooJ85z5GJShUvyjjJB1M LFMsZBJ0zArePIH1hxQpQCavb7HVGijUHgzDXX26cyKBEnecNh+8j9yrNnfkmtjFVG7Fi1gLct1Ca 0FJzG33a3421znIS1UXp9M68DG1s8YgCoujc2TduZSU7vqQFZahXPvHkutGid4f3BXzk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=QHlUY1Jc6CgLgtxrc+iSg/6ndpWn0vz6Z2ZUN5umMAI=; b=fzOSZ1NTqKDjtboM97SJ+abgR hsm2dXzskr0zbQWD1+sO6rvzk6ptZ7ZAN7DaDP7zv8Iokcewy0YSWmxQr3sn7qhxw9Sk7Pm+5aIbN NE8m80HVTEDefpEd0+qcQ2hLuzp7O1l4gOFcqu/j/xmOmiK7hzgyuOD1eGfoRQIhwn/ebkN7GrCmW PHYJ1rGyKhxUJ8C+nt8bcSDlzkB378SGrNK33oGZvEqK0HSTgH8NrLzCpeGaJwyuPY2jzw97NEgam WXkMv344ogcRWCgfkw3X+3gGRWz4qfuRhsc913cL1kkzyapEqS3+lIjr0j900RD/+knN7fLeovlml b/i8GJGOQ==; In-Reply-To: <20180414141316.7167-1-willy@infradead.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: linux-nilfs@vger.kernel.org, Jan Kara , Jeff Layton , Matthew Wilcox , James Simmons , Jaegeuk Kim , Andreas Dilger , Nicholas Piggin , linux-f2fs-devel@lists.sourceforge.net, Oleg Drokin , Ryusuke Konishi , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Mike Kravetz From: Matthew Wilcox Avoids walking the radix tree multiple times looking for tags. Signed-off-by: Matthew Wilcox --- fs/dax.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 19ac013204a1..b68b2f81fa47 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -586,27 +586,28 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, static int __dax_invalidate_entry(struct address_space *mapping, pgoff_t index, bool trunc) { + XA_STATE(xas, &mapping->i_pages, index); int ret = 0; void *entry; - struct radix_tree_root *pages = &mapping->i_pages; - xa_lock_irq(pages); - entry = get_unlocked_mapping_entry(mapping, index, NULL); + xas_lock_irq(&xas); + entry = get_unlocked_entry(&xas); if (!entry || WARN_ON_ONCE(!xa_is_value(entry))) goto out; if (!trunc && - (radix_tree_tag_get(pages, index, PAGECACHE_TAG_DIRTY) || - radix_tree_tag_get(pages, index, PAGECACHE_TAG_TOWRITE))) + (xas_get_tag(&xas, PAGECACHE_TAG_DIRTY) || + xas_get_tag(&xas, PAGECACHE_TAG_TOWRITE))) goto out; dax_disassociate_entry(entry, mapping, trunc); - radix_tree_delete(pages, index); + xas_store(&xas, NULL); mapping->nrexceptional--; ret = 1; out: - put_unlocked_mapping_entry(mapping, index, entry); - xa_unlock_irq(pages); + put_unlocked_entry(&xas, entry); + xas_unlock_irq(&xas); return ret; } + /* * Delete DAX entry at @index from @mapping. Wait for it * to be unlocked before deleting it. -- 2.17.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot