From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-322982-1516221803-2-16842095618475998665 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516221802; b=EtispSQ4MyobqTBq9X46AgwqWyBgmLPm6CCg6AcmDPJFXDf 6HksHZ0FEaK6bna11atDNPvD2KpbwugdIDeIRfxxc8Kz6OseiR5LZy+vGV89Hv9r a+hMw6DEWYt6M3l2ajymLk9eoZPAsdKmySzp51+TTxjiPpwDD4/cUOy75WLuJ1ut tTici1/6mdcrD1adyf3pH2tmLj97EwP5ZKMmEGSsSa9Y03G4in5j2RlgS0iLy3+E NlcuJ109/JtlliThdcnbp6T9NRqhRPYGrfKvhJHSHXfCZdpRZ8XyZ6wbT4n3qz8L SPLK+G9oiEJZzCOphy8Axhq7amJz7RKIzDL6fRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516221802; bh=1yJBBOGdqiHLO7p41OSzKr0kWNo+mwrafoXiIvZvag8=; b=X320mX3nCDOL Iagie3pIS7N+V7u2ULJL+t8SkTOOcs3W+5UOnMgDwxW2tSupt4LSTRqEBWs+8NGh YdSsG7iARkvoIqrr1eUtgPpwEm7P3lIs6CZKch6gkfFTfXw8D1Drp7V5NdbawLsr 3MjVtn6/nXDNWxjOr6sMf2+SJhSRXEnTZ5Bdr1EwJfB7UbpOUVlRTf1xat0YyhJb loRn5+D7G7RGoXuoXo2peQ88ipK8bzFdnZjmg/WOP8qRWJ9DxoyTKqvpf9hHAL9H fxUz7oGpAkCCE0gH5f/gMKoPq9AOIr8GrJjdY7r/8GabwbL5/jYd0ZrTFyXC1ysM 3xp8x1hOZA== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=uVzUKcEi x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=uVzUKcEi x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754594AbeAQUm4 (ORCPT ); Wed, 17 Jan 2018 15:42:56 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:52259 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753723AbeAQUWv (ORCPT ); Wed, 17 Jan 2018 15:22:51 -0500 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , 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, Bjorn Andersson , Stefano Stabellini , iommu@lists.linux-foundation.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, intel-gfx@lists.freedesktop.org, cgroups@vger.kernel.org, linux-sh@vger.kernel.org, David Howells Subject: [PATCH v6 61/99] dax: Convert dax_writeback_one to XArray Date: Wed, 17 Jan 2018 12:21:25 -0800 Message-Id: <20180117202203.19756-62-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180117202203.19756-1-willy@infradead.org> References: <20180117202203.19756-1-willy@infradead.org> Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Matthew Wilcox Likewise easy Signed-off-by: Matthew Wilcox --- fs/dax.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 9a30224da4d6..b66b8c896ed8 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -632,8 +632,7 @@ static int dax_writeback_one(struct block_device *bdev, struct dax_device *dax_dev, struct address_space *mapping, pgoff_t index, void *entry) { - struct radix_tree_root *pages = &mapping->pages; - XA_STATE(xas, pages, index); + XA_STATE(xas, &mapping->pages, index); void *entry2, *kaddr; long ret = 0, id; sector_t sector; @@ -648,7 +647,7 @@ static int dax_writeback_one(struct block_device *bdev, if (WARN_ON(!xa_is_value(entry))) return -EIO; - xa_lock_irq(&mapping->pages); + xas_lock_irq(&xas); entry2 = get_unlocked_mapping_entry(&xas); /* Entry got punched out / reallocated? */ if (!entry2 || WARN_ON_ONCE(!xa_is_value(entry2))) @@ -667,7 +666,7 @@ static int dax_writeback_one(struct block_device *bdev, } /* Another fsync thread may have already written back this entry */ - if (!radix_tree_tag_get(pages, index, PAGECACHE_TAG_TOWRITE)) + if (!xas_get_tag(&xas, PAGECACHE_TAG_TOWRITE)) goto put_unlocked; /* Lock the entry to serialize with page faults */ entry = lock_slot(&xas); @@ -678,8 +677,8 @@ static int dax_writeback_one(struct block_device *bdev, * at the entry only under xa_lock and once they do that they will * see the entry locked and wait for it to unlock. */ - radix_tree_tag_clear(pages, index, PAGECACHE_TAG_TOWRITE); - xa_unlock_irq(&mapping->pages); + xas_clear_tag(&xas, PAGECACHE_TAG_TOWRITE); + xas_unlock_irq(&xas); /* * Even if dax_writeback_mapping_range() was given a wbc->range_start @@ -717,9 +716,7 @@ static int dax_writeback_one(struct block_device *bdev, * the pfn mappings are writeprotected and fault waits for mapping * entry lock. */ - xa_lock_irq(&mapping->pages); - radix_tree_tag_clear(pages, index, PAGECACHE_TAG_DIRTY); - xa_unlock_irq(&mapping->pages); + xa_clear_tag(&mapping->pages, index, PAGECACHE_TAG_DIRTY); trace_dax_writeback_one(mapping->host, index, size >> PAGE_SHIFT); dax_unlock: dax_read_unlock(id); @@ -728,7 +725,7 @@ static int dax_writeback_one(struct block_device *bdev, put_unlocked: put_unlocked_mapping_entry(&xas, entry2); - xa_unlock_irq(&mapping->pages); + xas_unlock_irq(&xas); return ret; } -- 2.15.1