From patchwork Fri Dec 15 22:03:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 10116477 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 BB86B60327 for ; Fri, 15 Dec 2017 22:29:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE6242A125 for ; Fri, 15 Dec 2017 22:29:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A33C02A1BC; Fri, 15 Dec 2017 22:29:28 +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 44FE32A125 for ; Fri, 15 Dec 2017 22:29:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756827AbdLOW30 (ORCPT ); Fri, 15 Dec 2017 17:29:26 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:51393 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756628AbdLOWFW (ORCPT ); Fri, 15 Dec 2017 17:05: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=Q69+Wj076p6U0Esf3JxjMdaU2B+mCgdgZ4c1IthPP9A=; b=a43fBk2q7ZykHm4WWmQJd34qW g9D3CHCMqwbmwbGMjEfM/AhTHx68usTp7Ekh7thASyvOcQvFHK9uFempK+pC5hV4ERMs1wYnOP+wV NvRG6iuJiZ2D793AaD2a70JWlnQTkef8Vny72FCsXwMSaYeeGkoji2/QEazVXjiUY7dIS+tDIf0VO p7y5luZy/GGsWXE7SU2R/K32l/r1iW6Z558rjNtOaSIaf7Sxk6IKkUI3yJ3GkTmIG5jgVPUUQ7udT By9wWdE+j1ZtL+zwG00A2oi5W0cGhTkjCEhWy7BHUxg3GodtZIXrCc5R3Y9YuOsXd9r1q6kbYm3+o 2EbPAF23g==; Received: from willy by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1ePy6G-00026u-M2; Fri, 15 Dec 2017 22:05:00 +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 27/78] page cache: Convert page deletion to XArray Date: Fri, 15 Dec 2017 14:03:59 -0800 Message-Id: <20171215220450.7899-28-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 The code is slightly shorter and simpler. Signed-off-by: Matthew Wilcox --- mm/filemap.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 91df92f5c96d..c9bc0dee0154 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -115,27 +115,25 @@ static void page_cache_tree_delete(struct address_space *mapping, struct page *page, void *shadow) { - int i, nr; + XA_STATE(xas, &mapping->pages, page->index); + unsigned int i, nr; - /* hugetlb pages are represented by one entry in the radix tree */ + xas_set_update(&xas, workingset_lookup_update(mapping)); + + /* hugetlb pages are represented by a single entry in the xarray */ nr = PageHuge(page) ? 1 : hpage_nr_pages(page); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageTail(page), page); VM_BUG_ON_PAGE(nr != 1 && shadow, page); - for (i = 0; i < nr; i++) { - struct radix_tree_node *node; - void **slot; - - __radix_tree_lookup(&mapping->pages, page->index + i, - &node, &slot); - - VM_BUG_ON_PAGE(!node && nr != 1, page); - - radix_tree_clear_tags(&mapping->pages, node, slot); - __radix_tree_replace(&mapping->pages, node, slot, shadow, - workingset_lookup_update(mapping)); + i = nr; +repeat: + xas_store(&xas, shadow); + xas_init_tags(&xas); + if (--i) { + xas_next(&xas); + goto repeat; } page->mapping = NULL;