From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH v5 43/78] shmem: Convert shmem_confirm_swap to XArray Date: Fri, 15 Dec 2017 14:04:15 -0800 Message-ID: <20171215220450.7899-44-willy@infradead.org> References: <20171215220450.7899-1-willy@infradead.org> Return-path: 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=qLryO9+ckcDAdADvQbQXMn1DhH2IKMDVdBwW6eaBbws=; b=VZsNyDa6sd45NzGgDAyTjhBp1 0ZzVq3J+bq7+YnizvM3wzFBANz3MzNclgZiCbBKlmt5861sIiU0bloMlILEqj0vc0QADENVeaZnnM 4ZdsfuyvRryjex5q5lv1b2NzmeYtTXoTfy8cssyY0rxyaKVX71QIS7hrlVyexMXp2Jvj4u86cv/vj T5mnT+EDeyXLEU7Ov6tDOqJ6ouDicKdhbitNf0hxr/pkJB5l4kFnB2s4yJvAkz96HSZM8yq33sBlN RQpgOLJZ0ZjyHoyKcGfmCFqvbSbhJJD5h0zytl9AdZ1aS6hdO5yqOFObjS3xJ+mp6c9UFaBRbCezc V63ZmYwgA==; In-Reply-To: <20171215220450.7899-1-willy@infradead.org> Sender: owner-linux-mm@kvack.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 From: Matthew Wilcox xa_load has its own RCU locking, so we can eliminate it here. Signed-off-by: Matthew Wilcox --- mm/shmem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index fad6c9e7402e..654f367aca90 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -348,12 +348,7 @@ static int shmem_xa_replace(struct address_space *mapping, static bool shmem_confirm_swap(struct address_space *mapping, pgoff_t index, swp_entry_t swap) { - void *item; - - rcu_read_lock(); - item = radix_tree_lookup(&mapping->pages, index); - rcu_read_unlock(); - return item == swp_to_radix_entry(swap); + return xa_load(&mapping->pages, index) == swp_to_radix_entry(swap); } /* -- 2.15.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org