From patchwork Tue Mar 6 19:23:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10262639 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 743AF602BD for ; Tue, 6 Mar 2018 19:35:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66AC329147 for ; Tue, 6 Mar 2018 19:35:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B29C29162; Tue, 6 Mar 2018 19:35:32 +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 101A129147 for ; Tue, 6 Mar 2018 19:35:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933229AbeCFTfH (ORCPT ); Tue, 6 Mar 2018 14:35:07 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:49136 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933206AbeCFTYf (ORCPT ); Tue, 6 Mar 2018 14:24:35 -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=Dnse6NpPcxn4uwM47SH2ODqvDBOEEd/I1UOPFvRSo1Q=; b=q5VttMnnhlDYynVPa1464a55Y /5hWzuqfBwUu9Pm3MHcIhrsy8c52clgzm9ZE9gmgmozknfcvKtsh5ppLPsE0K5Z3X+yT2IcYy/DXD tyI8Am7P3M1Kpe59JsVDqaCrYkZREvxpLDO7VrnqFPjkQm4jZE5Y1RHfjlgP45MS0Wc8rw0GdiGLF Sad70XJXvfoRZmSQdopZfan9oRHlGXUCBOJuLns112DGRLO7x3BRvCovM34ElXV0+F+1tRKeThv2m /39Rjy7bDGCSY5ODsRcijTq1+oyohyS1EOhglPvVOJQXgn6fpJnVTxgue7Yt3TcqwzmZKcIG7VJqW xr/3jv3YA==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1etICP-0001bs-Hi; Tue, 06 Mar 2018 19:24:33 +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, linux-btrfs@vger.kernel.org Subject: [PATCH v8 39/63] mm: Convert __do_page_cache_readahead to XArray Date: Tue, 6 Mar 2018 11:23:49 -0800 Message-Id: <20180306192413.5499-40-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180306192413.5499-1-willy@infradead.org> References: <20180306192413.5499-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 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;