Received: by 10.213.65.68 with SMTP id h4csp358284imn; Tue, 13 Mar 2018 06:42:06 -0700 (PDT) X-Google-Smtp-Source: AG47ELs3jRSxJ6ZrBqe8LifkOGya3cAW5g70NrJiQYWy7PPREpPFYAmQ7MZkb1Ce8BSxjrT+xMR5 X-Received: by 10.101.81.76 with SMTP id g12mr567934pgq.88.1520948526086; Tue, 13 Mar 2018 06:42:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520948526; cv=none; d=google.com; s=arc-20160816; b=GYbzyiu/rrZz0DWHYkkRWB1YJ14B/d2GoPwrQ4pbzNr6Yzft5jwE8w5VciE/rYyWNW Q9yW6awKOC+7pQ0sz4vjIfc5m/3sUD/YcbVDvUwJhF/k2VhpxYKFFI2bohAn1IUqiExg 4W/LyHrERFRJg8Bb4AALzykNBuQW2tFaSi+8l1FdpJjTIufB+3P/x5byk35vH95urlhn otRFkBKdc3mTIA6QpXpY9Q4Mfka7GbyJFRifjAAVa2gbhda+75pe6CTWGZngX4omm8X3 74bfH2TomDf5SkZ/6GfQg/ntgSZDbWhbq+iB7UKteBMdkvTpn1ZbIBopuX4Fa7U6Qn8C rzhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Dnse6NpPcxn4uwM47SH2ODqvDBOEEd/I1UOPFvRSo1Q=; b=VOsH3RZzqqf8qXSuqwTV37TIJmycRDKBeGKw+LM0v7pThsbT87iEkPDmmvH3hZysPp bL5yDb487DLgsfmww+opcyVKzvwhjrpG2dFgctVjEM8rqXPXCIEAgnsEN374TO500Y68 A/wUKhtS8HfxxZpMLJH7TF4wqfCq+DejNakr8wpwjqjNmEGTkQyBhfIMRSvccRhhTdDF 11K1Vn0E1cUN22msrhlatWXCF8W5QEWPReWo9iTlGvz+RJYqJrM5Soce6vGcAM/T0TG7 RkJMzzbqUqy5ax4aLHBEBkbBWcdqMnNWWPGDqqmj9ObtgV4kTTrd96ugm8bUPDPD9D2P kUHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=jp9oe7wh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7-v6si135919pln.666.2018.03.13.06.41.51; Tue, 13 Mar 2018 06:42:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=jp9oe7wh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933034AbeCMNkl (ORCPT + 99 others); Tue, 13 Mar 2018 09:40:41 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:35350 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932495AbeCMN07 (ORCPT ); Tue, 13 Mar 2018 09:26:59 -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=Dnse6NpPcxn4uwM47SH2ODqvDBOEEd/I1UOPFvRSo1Q=; b=jp9oe7whrexJcmXbOQw0tnU43 q/fYHvCEOMh/0BWOXzQQKRcDEaVKWODRmmFZVCUOUpgUh8tMcg4p9ukBc3r9fZWjpv/0pdIa97kfE s6oNO4ZblTg6Q7ZX+x3QxwpV1AMf21V/hjbtqohN+j0ID2nBim0SWgSUVW4nlNIbnpckLyrE/MM09 DasUr4NPwIaW4Kdm/JeuzmDOwLTREM72fRkNG7WkkYx40YpHGDpjHNxVpbgSkj3MFyy2XjjRJ70L9 Nd+lTP1ch2SE3XX9AxtjkiF9qybkRyoNs3sM0ftMtjLlP5SWV4W8/ZZoE92PzCdnUvXlRvz5J+QH9 hiaXhrA7Q==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1evjxB-0004h5-UJ; Tue, 13 Mar 2018 13:26:57 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ryusuke Konishi , linux-nilfs@vger.kernel.org Subject: [PATCH v9 37/61] mm: Convert __do_page_cache_readahead to XArray Date: Tue, 13 Mar 2018 06:26:15 -0700 Message-Id: <20180313132639.17387-38-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313132639.17387-1-willy@infradead.org> References: <20180313132639.17387-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox This one is trivial. Signed-off-by: Matthew Wilcox --- mm/readahead.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index 3ff9763b0461..5f528d649d5e 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -174,9 +174,7 @@ int __do_page_cache_readahead(struct address_space *mapping, struct file *filp, if (page_offset > end_index) break; - rcu_read_lock(); - page = radix_tree_lookup(&mapping->i_pages, page_offset); - rcu_read_unlock(); + page = xa_load(&mapping->i_pages, page_offset); if (page && !xa_is_value(page)) continue; -- 2.16.1