From patchwork Wed Dec 6 00:41:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10094581 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 E016960329 for ; Wed, 6 Dec 2017 00:59:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D213A28A27 for ; Wed, 6 Dec 2017 00:59:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6DE528A88; Wed, 6 Dec 2017 00:59:20 +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=ham 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 53A0D28A27 for ; Wed, 6 Dec 2017 00:59:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753332AbdLFA7E (ORCPT ); Tue, 5 Dec 2017 19:59:04 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:47025 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753331AbdLFAmM (ORCPT ); Tue, 5 Dec 2017 19:42:12 -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=XQU2Kw3cHQT+EsBIjVX2LeyQu/xBqyMgwX17vGFfHB4=; b=fSLgD5srlTBwEcI+19/YbXOQK Cpaudn6Rj2JPUZKx4EtQBRxsFrEDexbJhCRgsELDzcN14xfN1T7SP2dwyd/o7bz+iXtAVuKiJPaoP uSlxarCB6Hu3C8VtSjzPQOe74WD23aBYrNc5UHj3OquRXhWMrax9+9il+FuiaPy4frSs9yFxdehV/ zAaWomJx3HQiBRegiUO7RZiiQM/E0WuzPrDzVNYRSBklnCRfcwIqrwjoczQezFrxpm8Z/brkcWDjM ia9mbzKTBQ/+0lD4UW960G53aCpudkdIIqeX8WWXvK+NQu/v/mduIe40SeDY74Wrgy2wtUTUP/IlK EunTez6CQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1eMNmr-00015w-QO; Wed, 06 Dec 2017 00:42:09 +0000 From: Matthew Wilcox Cc: Matthew Wilcox , Ross Zwisler , Jens Axboe , Rehas Sachdeva , 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-kernel@vger.kernel.org Subject: [PATCH v4 35/73] mm: Convert __do_page_cache_readahead to XArray Date: Tue, 5 Dec 2017 16:41:21 -0800 Message-Id: <20171206004159.3755-36-willy@infradead.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171206004159.3755-1-willy@infradead.org> References: <20171206004159.3755-1-willy@infradead.org> To: unlisted-recipients:; (no To-header on input) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@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;