Message ID | 20180617020052.4759-49-willy@infradead.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 B32C9600CC for <patchwork-linux-mm@patchwork.kernel.org>; Sun, 17 Jun 2018 02:02:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A377C28C47 for <patchwork-linux-mm@patchwork.kernel.org>; Sun, 17 Jun 2018 02:02:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 975F828C5E; Sun, 17 Jun 2018 02:02:44 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3ECBD28C67 for <patchwork-linux-mm@patchwork.kernel.org>; Sun, 17 Jun 2018 02:02:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F39CE6B0278; Sat, 16 Jun 2018 22:01:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EC30B6B027E; Sat, 16 Jun 2018 22:01:10 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC87D6B027F; Sat, 16 Jun 2018 22:01:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 806216B0278 for <linux-mm@kvack.org>; Sat, 16 Jun 2018 22:01:10 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id c6-v6so7715434pll.4 for <linux-mm@kvack.org>; Sat, 16 Jun 2018 19:01:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=L6O28U5bPiiNtAEzNBl43V8G8xo3oJqGs/4QpqAVQhg=; b=FIJxBHKUSgo7nunKsa4H6uGYZspdyTTjNjGb2XgBixTJ8iAHWLN1L9VrAdzpVQe15u lFiW3PbWJM9WFebmcLAyPAtFU7usLaAfIs5nLZ3yM0+ffFaiY8AWEeiy3/9GS7n/IXFh uv2vTnHXPS10BFGErAszt8pD3ddt+80o/egHGoDkqKTUMOoASxDfYKhN5Bto7rJLqnlF 8iiwyhtbC9N1ZL//E0lljLXLCxnRxkSveotuo7tANoOj3zUcq7xJ0jUacE1u7mDR7WIT vwaVDl9Klfh7H323BNCinAe/ALVpZxqYPe4kxfUfkjuaDIcFDIdgrp+uQlOcSsCCnOPQ Qbyg== X-Gm-Message-State: APt69E0HtMnMBeuSkXm2kTirNWYPV4LyHBwxKp1gu+icWWpr+2KlyHQA I+GHPLDaeZ0PRHl+CPde4we0NQ6A65HJ0FNNqLIiChxFkxxoauE63D60F/sa50aBCE3terdSA0D raR1b3Fms39M+NfXyX0eEgr2Z71dZhfudjvMVsfXDaGQUUz5VZaH+N9zFhxD8NWYAsA== X-Received: by 2002:a63:384c:: with SMTP id h12-v6mr6610589pgn.230.1529200870209; Sat, 16 Jun 2018 19:01:10 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLAoY3GewRpNd8GdQ8TEQ1H+YeRtVUi9AVjNNmci9uG2+gINAQCKR9PHiX7kQt58OX+oWZb X-Received: by 2002:a63:384c:: with SMTP id h12-v6mr6610560pgn.230.1529200869473; Sat, 16 Jun 2018 19:01:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200869; cv=none; d=google.com; s=arc-20160816; b=c4DjKXmj+S+FQXeTqeg8Kj1hfyDxNYTnXOj9u2nVMIurCBej+EjKUei8eR+jWIXVYZ oYPYQtPCelT2bbsXD1UfeUTJA3UxqNc2jT/IBgD774MFIG4m4K7MW+Mq4O3GXTG02by5 knA+R9ysXbwZuuY93TeGigDr+j/7EflTtNZsdOJPqar0tcCj5dJ7l6VQuSwLV7/EbWNI n+T78Do1leWhyriFdMJSaKBLSlg63yoVH1KJLrnnL5E41ZT+GFfWhGwQs6fjr/QXwc3m f9qOXt2r04FHisoGjGTdLDykc8KtA+w7838DpJ/npgPvCG2IQdPJdJpgZFLQEPXbHWhi I1IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=L6O28U5bPiiNtAEzNBl43V8G8xo3oJqGs/4QpqAVQhg=; b=RMwmzoHtyttaQtpalW8Yi4h3/y8x7hoVc1aTOwHZQ6gq9nIHmsQ5buCPyPsn2BLV1H wkR4BOLnVElQMsO88YcjcMvhK4FUdIwr4K2N44HGgSh+M3DNqBcqrb8sr1TcFOo7cAno aIGOnquqc52cy0tQHrjG9hK4VYdAN0ocIvjOso/6cjgZ/V08mUajBLIVBzCISccILB9R zhcgSylOsuJS2iksvq29y4hD4zxoUH5v6g/x3cB6s4knQUoDMt7TEEKQh2rJdP+Vs7pG dN1bqcJRRBl4DWHcW/iiQluRIMTq6qEm80gID8Rs76eGEdwI7k8OPVDjXs75EYI7w6WA cx5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=tl7JYoDT; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id f67-v6si11968289plb.460.2018.06.16.19.01.09 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=tl7JYoDT; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org 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=L6O28U5bPiiNtAEzNBl43V8G8xo3oJqGs/4QpqAVQhg=; b=tl7JYoDThgJELlV7nSJi9IIDV OfbXxR9CH0fIieO+rRqBzXr7h+GVspI0Ku3Y1/zp+VlYY5EHSkg0SFcNfMnTO2vCucsZC2RcNWP4h OkZ+Li1NnFfvpobXmooUXkVVCYIM90Rsxs4vccWME81KDr/BWupjwTTloNIVQ7vgjMQd+kTABpbf4 EHAqbOIIZIXfyd3PzqnkhlEzE+JGDMdHLTGzigeUGGJR0v7oMzkxd/ll4XHkQZe8Gn1zILSpQWC01 WrRkE9Poy0DFiBl1ysSbTmWp/HZPqCaOYKbOFt1jX+Of08BVfgy0jg61pzX3j5/hRR9mlfHlPccZN 5q+D2d6sQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUN08-0001O6-MX; Sun, 17 Jun 2018 02:01:08 +0000 From: Matthew Wilcox <willy@infradead.org> To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox <willy@infradead.org>, Jan Kara <jack@suse.cz>, Jeff Layton <jlayton@redhat.com>, Lukas Czerner <lczerner@redhat.com>, Ross Zwisler <ross.zwisler@linux.intel.com>, Christoph Hellwig <hch@lst.de>, Goldwyn Rodrigues <rgoldwyn@suse.com>, Nicholas Piggin <npiggin@gmail.com>, Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>, linux-nilfs@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <yuchao0@huawei.com>, linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v14 48/74] shmem: Convert shmem_confirm_swap to XArray Date: Sat, 16 Jun 2018 19:00:26 -0700 Message-Id: <20180617020052.4759-49-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180617020052.4759-1-willy@infradead.org> References: <20180617020052.4759-1-willy@infradead.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/mm/shmem.c b/mm/shmem.c index 2b8720d32e7a..479e4a8e6d68 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -348,12 +348,7 @@ static int shmem_replace_entry(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->i_pages, index); - rcu_read_unlock(); - return item == swp_to_radix_entry(swap); + return xa_load(&mapping->i_pages, index) == swp_to_radix_entry(swap); } /*
xa_load has its own RCU locking, so we can eliminate it here. Signed-off-by: Matthew Wilcox <willy@infradead.org> --- mm/shmem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)