From patchwork Mon Feb 19 19:45:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10228669 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 0E4D3602B1 for ; Mon, 19 Feb 2018 19:54:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F33D228A6B for ; Mon, 19 Feb 2018 19:54:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E592C28A46; Mon, 19 Feb 2018 19:54:40 +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=unavailable 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 9126E28A46 for ; Mon, 19 Feb 2018 19:54:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932098AbeBSTyU (ORCPT ); Mon, 19 Feb 2018 14:54:20 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:44880 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753764AbeBSTqW (ORCPT ); Mon, 19 Feb 2018 14:46:22 -0500 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=b8tOla7aSyhxhazB08YxD6CFrUEn2iSE0UzMAWCNhrw=; b=XpDgmgTfeOjkT13IGSHNODvpt SCs8TNcLz+zJk7I/odrC1zMpTe41nfPLAIonV057JxQnSCo/Rk0+ZIKVIsZlU2H85gTbWA5wG1+Qi YxTr/++nlGsCEjIpmjFqu+GgRbeLj3gf59mu+xY6eSIXZSbOOPFfWe4/kaZGECXg9eP8RJQHrByy9 3SFVXcyOxQmhEPw4d0keQdsurE0rTxtOCz68UdwnWckba5D51wNavhb0xoiH1LqpZX76S1yj1eDOf +WmfmCgFBXV2UPyi7JGohNRLOxV5YnHurMKddZAaCxxSDDri7poOlVCcnTKMdEuUBp4ec7EBqzk0S w+LT3Dc2w==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1enrOG-0001ru-Hu; Mon, 19 Feb 2018 19:46:20 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v7 38/61] mm: Convert __do_page_cache_readahead to XArray Date: Mon, 19 Feb 2018 11:45:33 -0800 Message-Id: <20180219194556.6575-39-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219194556.6575-1-willy@infradead.org> References: <20180219194556.6575-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 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 f64b31b3a84a..66bcaffd47f0 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->pages, page_offset); - rcu_read_unlock(); + page = xa_load(&mapping->pages, page_offset); if (page && !xa_is_value(page)) continue;