From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-322982-1516222222-2-8061481944714116765 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 en, 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=1516222221; b=Cm4Xf14zYvjtenSbC7/IR68UncwQMFFK/UIY2VylOPWBKIK bY/u9n2gTCrFL8jY8Ow66RxrNZi8S+BN4oLM0EfnoBELo+yKMHD+LyzgLVcsnDZa AU0dQnSb9SMb4rkXMegnj79upFBlTxMDzQjpqlxYYRAf/aqFxGYFFyel7+m5+0DO yFFXSpuqIe6IrKG7qzJpE+0gsm+jrwrSMFmDEBODIbJSu7iknABub/TR+V5B6wNc /SZUxfm8V8JA4TlHi6ktqMoTUIlXRX0B9sQ7b33WzNosNOG2T//N/7Kz4p4vGQfq KrYaHP2lFtp5CERxRjvrnAdVUzBCEsivlra6aug== 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=1516222221; bh=lGjj0jyxrKf+7BwSOpZgnpGZasipA8iKUyiqUZeYCBI=; b=qdfxeTs+dwu1 VP90/4/PxU8/WC1jp6XlE/7CgcW4aYxdW2HFvqzAr+6yRsIF+sn7XuMsXMiaC2pP QdmI490OFoeIXYWTYnAT6UYhm+iRGvB2kVk5V1hI9J6fkShfQUkPIZUHjgnmTkO3 Srcxt7ogxG8CRhQ3tWuNNXpN6MoSCJP5cJmx3vd0zHgEwp2J6VqqrsFQmJca+OeR 1wPSX7+IpIn88Znpvrv3F6FP+/0Yix90F1rtEOK5wdDJ9f887P3EzbmR63Wt4MLR hY/Q4W6rB7QCEQ98dDEvjCrDRci5Y8OTgAPwoNVykgyQH1J1P3VVw+11BKd/FFUy BLVpEscCOw== ARC-Authentication-Results: i=1; mx6.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=GMVfCuzZ 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: mx6.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=GMVfCuzZ 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 S1754591AbeAQUtw (ORCPT ); Wed, 17 Jan 2018 15:49:52 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:46589 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753665AbeAQUWp (ORCPT ); Wed, 17 Jan 2018 15:22:45 -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 48/99] shmem: Convert shmem_free_swap to XArray Date: Wed, 17 Jan 2018 12:21:12 -0800 Message-Id: <20180117202203.19756-49-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 This is a perfect use for xa_cmpxchg(). Note the use of 0 for GFP flags; we won't be allocating memory. Signed-off-by: Matthew Wilcox --- mm/shmem.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index e8233cb7ab5c..5a2226e06f8c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -635,16 +635,13 @@ static void shmem_delete_from_page_cache(struct page *page, void *radswap) } /* - * Remove swap entry from radix tree, free the swap and its page cache. + * Remove swap entry from page cache, free the swap and its page cache. */ static int shmem_free_swap(struct address_space *mapping, pgoff_t index, void *radswap) { - void *old; + void *old = xa_cmpxchg(&mapping->pages, index, radswap, NULL, 0); - xa_lock_irq(&mapping->pages); - old = radix_tree_delete_item(&mapping->pages, index, radswap); - xa_unlock_irq(&mapping->pages); if (old != radswap) return -ENOENT; free_swap_and_cache(radix_to_swp_entry(radswap)); -- 2.15.1