From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-331097-1516221720-2-14609521442308611750 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 unknown, 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=1516221720; b=ILuukjJK1RsRr3sw2raLNBFhxNC9bto0WsnIh0OKlgvnjyG 1bwLjX0fWCrLCA8cnR6Xr/O277ke+rCu4q69HfgYCaRJ9lWS9C0fgTaOEqk+FAxW Q2zKK1gouA1rbo0uEsGvYK246edULFVKH9qw5jHBNDr6lA20kLjTs2HRAUXv3T3G qmpUJXcgNRYeptS35bsmGWOsUoaYpLoGBWJq+pz6INLSxVrxXxZWBe9Qt8CTV7/9 G1X09s12qXhXIhJX6byy/AIrgkGfGtZ60KKHSK9YakSsUaiQ0lWNk9boSMBYEU1q oFDBJM1E0NWk2u70KMGI9W+lSw4Zp3bGVPoMiJg== 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=1516221720; bh=jZEmNdccTLa3Y5rwp6DR+UoAIJURAxzgh86FcSz5G5I=; b=AS6GtcvgsOiF ZJDC1fuXJ6Zb2tookaImWKlj1cPjmr01qsNZ9CVmq7G3TtR2H184ac46EyJ3WLDm jLUEii5IH7LrC6YBXj+DI5ooZDZp2TC6gxwklUdTUXoTYnZx6z0zAA8ziR8Z6hUo 9ZqtOLtv6y2iW12YrFnn0N5HKpw/aYMikIW7XAILBQAxcHGCjPk0nfYT2fGLPT17 mEGwTOmT3ncJCkRyhqcEbA5S1tH2bb7ff1kSgPn6eE2ZRa6Gj7ArWNNr7lpqaqAm 9ojBPz8qAIP/KybM6uHZoOMT6iA/l8zH/BZGHjMBXMQxt3fhIK5KLdoFGbnfNHtV awfT30yGIw== ARC-Authentication-Results: i=1; mx2.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=pUgZyHzE 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: mx2.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=pUgZyHzE 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 S1754695AbeAQUl4 (ORCPT ); Wed, 17 Jan 2018 15:41:56 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:54585 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753750AbeAQUWw (ORCPT ); Wed, 17 Jan 2018 15:22:52 -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 62/99] dax: Convert dax_insert_pfn_mkwrite to XArray Date: Wed, 17 Jan 2018 12:21:26 -0800 Message-Id: <20180117202203.19756-63-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 Signed-off-by: Matthew Wilcox --- fs/dax.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index b66b8c896ed8..e6b25ef112f2 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1497,21 +1497,21 @@ static int dax_insert_pfn_mkwrite(struct vm_fault *vmf, void *entry; int vmf_ret, error; - xa_lock_irq(&mapping->pages); + xas_lock_irq(&xas); entry = get_unlocked_mapping_entry(&xas); /* Did we race with someone splitting entry or so? */ if (!entry || (pe_size == PE_SIZE_PTE && !dax_is_pte_entry(entry)) || (pe_size == PE_SIZE_PMD && !dax_is_pmd_entry(entry))) { put_unlocked_mapping_entry(&xas, entry); - xa_unlock_irq(&mapping->pages); + xas_unlock_irq(&xas); trace_dax_insert_pfn_mkwrite_no_entry(mapping->host, vmf, VM_FAULT_NOPAGE); return VM_FAULT_NOPAGE; } - radix_tree_tag_set(&mapping->pages, index, PAGECACHE_TAG_DIRTY); + xas_set_tag(&xas, PAGECACHE_TAG_DIRTY); entry = lock_slot(&xas); - xa_unlock_irq(&mapping->pages); + xas_unlock_irq(&xas); switch (pe_size) { case PE_SIZE_PTE: error = vm_insert_mixed_mkwrite(vmf->vma, vmf->address, pfn); -- 2.15.1