From patchwork Wed Dec 6 00:41:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10094567 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 BBE7D60329 for ; Wed, 6 Dec 2017 00:58:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD6371FE8D for ; Wed, 6 Dec 2017 00:58:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A24FB28A63; Wed, 6 Dec 2017 00:58:39 +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 318A51FE8D for ; Wed, 6 Dec 2017 00:58:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639AbdLFAxP (ORCPT ); Tue, 5 Dec 2017 19:53:15 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:42545 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753360AbdLFAmN (ORCPT ); Tue, 5 Dec 2017 19:42:13 -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=aZQQeya/5yeMcoU9tOJOCt/Xand1m1fAUXYdyYt6N9w=; b=V8bke0VkDuZRGFPWlxP7BaGvf 4cQqlk3EjHA9QVUIgP3MwUn9qZ1BISZiMwlsX/C+7TtYUWJMxUIh0yqi8SnpQ/Ts7f0vGppOPHxl3 m1otulPYRCA62D3naAr2H6SEp516LJUpNx7U8PHM0ea3+tiWvF4d/4p0UuNDtJkV2I5f6JbPILpXM 5iye5cybgBzub1uFnhYEO9arRA9bHzfeAPBs0un/vrB7n8Ll4rR7Xdk2oumwluxoeS5+EA1XmYM/K loEBWDrL/p3Cc3rAsZez8j/lCoFlMpF/ppA394EbW/vmyVaJ4Z9VpN91by3dJfgrrztxkOgfylb/M xqUEiGUhQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1eMNmt-00018y-Ra; Wed, 06 Dec 2017 00:42:11 +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 51/73] btrfs: Convert page cache to XArray Date: Tue, 5 Dec 2017 16:41:37 -0800 Message-Id: <20171206004159.3755-52-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-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 b8b5b4562d50..96328c3a548e 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);