From patchwork Fri Dec 15 22:04:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10116093 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 0719E6019C for ; Fri, 15 Dec 2017 22:06:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED9C42A1B3 for ; Fri, 15 Dec 2017 22:06:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E287C2A1B7; Fri, 15 Dec 2017 22:06:56 +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 82FD32A1B3 for ; Fri, 15 Dec 2017 22:06:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932081AbdLOWGd (ORCPT ); Fri, 15 Dec 2017 17:06:33 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:54394 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756380AbdLOWGT (ORCPT ); Fri, 15 Dec 2017 17:06:19 -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=rB/9t7LpOsmVd4X3ijI5CeNPcYs8VhDGc9cOiAuygfo=; b=jvDAo1xHWJ58vgP0ZX4iYTup/ a1ViwFiwEDBrvt9jC4AEBkA3omhdzA5dYF23DL8sBYZupU29kXb6hnVcITFdSVcEKHhBOIKpL+FPW 0409dSh/dKQU2e7jPHuwCI7FEqedDvoYDKwv8p19c6H+Cem9yCCrQ8gV8wabSGSrTrbahPStyONXe ESuJVSWSx6CRKng5Z283LifXX7Hq332z+UNy8VhXd1oxPoey4zm93oAZ9mvIyjT2ui2VKFOIaemNP JVpGJgDya8nppPYJdaC2R3xIYrbuVu7D62FMdOcp5wLIstajrJUHKAfme0nS/umy7K5ssotrRIdo/ +/3LxkK7w==; Received: from willy by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1ePy6I-0002Aq-Ai; Fri, 15 Dec 2017 22:05:02 +0000 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Ross Zwisler , David Howells , Shaohua Li , Jens Axboe , Rehas Sachdeva , Marc Zyngier , 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-raid@vger.kernel.org Subject: [PATCH v5 52/78] btrfs: Convert page cache to XArray Date: Fri, 15 Dec 2017 14:04:24 -0800 Message-Id: <20171215220450.7899-53-willy@infradead.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171215220450.7899-1-willy@infradead.org> References: <20171215220450.7899-1-willy@infradead.org> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox Signed-off-by: Matthew Wilcox --- fs/btrfs/compression.c | 4 +--- fs/btrfs/extent_io.c | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index e687d06cd97c..4174b166e235 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -449,9 +449,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, if (pg_index > end_index) break; - rcu_read_lock(); - page = radix_tree_lookup(&mapping->pages, pg_index); - rcu_read_unlock(); + page = xa_load(&mapping->pages, pg_index); if (page && !xa_is_value(page)) { misses++; if (misses > 4) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 4301cbf4e31f..fd5e9d887328 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5197,11 +5197,9 @@ void clear_extent_buffer_dirty(struct extent_buffer *eb) clear_page_dirty_for_io(page); xa_lock_irq(&page->mapping->pages); - if (!PageDirty(page)) { - radix_tree_tag_clear(&page->mapping->pages, - page_index(page), + if (!PageDirty(page)) + __xa_clear_tag(&page->mapping->pages, page_index(page), PAGECACHE_TAG_DIRTY); - } xa_unlock_irq(&page->mapping->pages); ClearPageError(page); unlock_page(page);