From patchwork Fri Mar 30 03:42:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10316845 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 D369A60467 for ; Fri, 30 Mar 2018 03:43:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C42AE286BD for ; Fri, 30 Mar 2018 03:43:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B88492A1C3; Fri, 30 Mar 2018 03:43:21 +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 6F32C286BD for ; Fri, 30 Mar 2018 03:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752951AbeC3DnE (ORCPT ); Thu, 29 Mar 2018 23:43:04 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:43528 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752796AbeC3Dmz (ORCPT ); Thu, 29 Mar 2018 23:42:55 -0400 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=6fFncBlYfUDhmzuZeZK3KuMK/lY6uFNf2oLLOyM7w1U=; b=rJQj5iJteaHaIMwW1o1cXFxWE Y3iPgloSjvbe22XO8tf/QkmQu1uBdpD4jmdfT2HUMoXiSMENyzW79OAXx4VwkhJY3e5sJk0aeaRJS ZPLG12iKjIbVY0aOyRvfcv/iGCsPhq5vWLsaZKStoA8QvMDWb9MB7f3NSmXtnPeUbeitCjbPIK5q0 llaVpD6suvQkfzoOVqTLhTTb9N9yUXhKfb0XAO1PZAbeGIWpez+ZpD7OW68EbiMgXnQqGuDRn4P9/ BvoUR+Ql4HIcm9X25bk6155M7vKekUSMxRTZac+VBlyh8ONBjDqNjgWAGAFlooL3nyRwCqZ0RI9E8 lkyb1RoRA==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1f1kwI-0002mg-6t; Fri, 30 Mar 2018 03:42:54 +0000 From: Matthew Wilcox To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: Matthew Wilcox , Jan Kara , Jeff Layton , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Nicholas Piggin , Ryusuke Konishi , linux-nilfs@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net, Oleg Drokin , Andreas Dilger , James Simmons , Mike Kravetz Subject: [PATCH v10 41/62] shmem: Convert shmem_free_swap to XArray Date: Thu, 29 Mar 2018 20:42:24 -0700 Message-Id: <20180330034245.10462-42-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180330034245.10462-1-willy@infradead.org> References: <20180330034245.10462-1-willy@infradead.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 aa7e92b24c19..be8c6d43b4aa 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -644,16 +644,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->i_pages, index, radswap, NULL, 0); - xa_lock_irq(&mapping->i_pages); - old = radix_tree_delete_item(&mapping->i_pages, index, radswap); - xa_unlock_irq(&mapping->i_pages); if (old != radswap) return -ENOENT; free_swap_and_cache(radix_to_swp_entry(radswap));