From patchwork Fri Dec 15 22:04:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10116167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C2D36019C for ; Fri, 15 Dec 2017 22:11:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EF0D2A1B5 for ; Fri, 15 Dec 2017 22:11:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23D5D2A1B8; Fri, 15 Dec 2017 22:11:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F00F2A1B5 for ; Fri, 15 Dec 2017 22:11:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932558AbdLOWJM (ORCPT ); Fri, 15 Dec 2017 17:09:12 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:54055 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756713AbdLOWFd (ORCPT ); Fri, 15 Dec 2017 17:05:33 -0500 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=yyg9GwGijNepWmDuuPGXIREk1oB9BbBSB674iPSyOjo=; b=Sp5KMkSpREEpzygKvSpuuheY+ 38tVO48nM/TLJ3MzAv1FycLNSzCkbYXleiQUWv48CDCVXjXwmlA/3ZnKcKxJc+L9uBjPvYHuzzc8k uoj4A8qzEVbHNg8HqoulgD2plNOOVwoJO9pfUQubJBGswHRlw6tfXOWxlm1sa+V32QJoQSt+rUsqO lBxmm1LvV4c7knR3jnVbZFO/vFQGaMClPpvENHxEDFqhmrEgkqV3VyqXup9F4AphJBX91P8vF7iyf ahZ38g6+M172PEIlB4YTKj9Kvgcu4N8Hk/Nbn1MqsJKTvH63AuJv/FVk/SsTOZly0ZbditgaNP4T2 QLMyk2HKg==; Received: from willy by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1ePy6I-0002Fy-Tb; Fri, 15 Dec 2017 22:05:02 +0000 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Ross Zwisler , David Howells , Shaohua Li , Jens Axboe , Rehas Sachdeva , Marc Zyngier , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nilfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-usb@vger.kernel.org, linux-raid@vger.kernel.org Subject: [PATCH v5 61/78] dax: Convert __dax_invalidate_mapping_entry to XArray Date: Fri, 15 Dec 2017 14:04:33 -0800 Message-Id: <20171215220450.7899-62-willy@infradead.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171215220450.7899-1-willy@infradead.org> References: <20171215220450.7899-1-willy@infradead.org> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox Simple now that we already have an xa_state! Signed-off-by: Matthew Wilcox --- fs/dax.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 2629ffa70575..d3894c15609a 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -413,24 +413,24 @@ static int __dax_invalidate_mapping_entry(struct address_space *mapping, XA_STATE(xas, &mapping->pages, index); int ret = 0; void *entry; - struct radix_tree_root *pages = &mapping->pages; xa_lock_irq(&mapping->pages); entry = get_unlocked_mapping_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; - radix_tree_delete(pages, index); + xas_store(&xas, NULL); mapping->nrexceptional--; ret = 1; out: put_unlocked_mapping_entry(&xas, entry); - xa_unlock_irq(&mapping->pages); + xas_unlock_irq(&xas); return ret; } + /* * Delete DAX entry at @index from @mapping. Wait for it * to be unlocked before deleting it.