From patchwork Wed Dec 6 00:41:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10094343 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 50F8060329 for ; Wed, 6 Dec 2017 00:47:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 427192989A for ; Wed, 6 Dec 2017 00:47:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 375A229915; Wed, 6 Dec 2017 00:47:45 +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 E04612989A for ; Wed, 6 Dec 2017 00:47:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753736AbdLFAqg (ORCPT ); Tue, 5 Dec 2017 19:46:36 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:37810 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753408AbdLFAmR (ORCPT ); Tue, 5 Dec 2017 19:42:17 -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=yH0JuBUZX7AzE2v2NvRbKuw/HhsfLw8gHarVCY+9mjo=; b=acjWSZq9CtUo5OoABCpjLAXRZ H2VWR0vIEpZVw3QRguhGbcHPC7ydQ3FgDztRLgK5yVu+R9JtnvBKiXnn1YRziG0aQpAAIgNL8DCyr d1QFlxlzJ8pCyLP6wp7nAABgdfJEIsuk5tLzAo/YvwD5clDZjiiLtYY95nJL6765i8C1WVRuAAbDA P8sq2vrquViSTecsLKGK8a6HOQPJKdqs+vueNUpAxdm3sKOxqS+7wcMnkx1S+Q0J3Pkb5bvvV9qCy LI7fGSjOugJx53lGk5fdT3LkioQXIv7eosKvguaMWm6uWojRDXsnep3SuLbw1fAjpOGDxLRdP6E7L +2daalo6A==; Received: from willy by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1eMNmw-0001C7-5C; Wed, 06 Dec 2017 00:42:14 +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 66/73] page cache: Finish XArray conversion Date: Tue, 5 Dec 2017 16:41:52 -0800 Message-Id: <20171206004159.3755-67-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 With no more radix tree API users left, we can drop the GFP flags and use xa_init() instead of INIT_RADIX_TREE(). Signed-off-by: Matthew Wilcox --- fs/inode.c | 2 +- include/linux/fs.h | 2 +- mm/swap_state.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index c7b00573c10d..2046ff6dd1b3 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -348,7 +348,7 @@ EXPORT_SYMBOL(inc_nlink); void address_space_init_once(struct address_space *mapping) { memset(mapping, 0, sizeof(*mapping)); - INIT_RADIX_TREE(&mapping->pages, GFP_ATOMIC | __GFP_ACCOUNT); + xa_init(&mapping->pages); init_rwsem(&mapping->i_mmap_rwsem); INIT_LIST_HEAD(&mapping->private_list); spin_lock_init(&mapping->private_lock); diff --git a/include/linux/fs.h b/include/linux/fs.h index c58bc3c619bf..b459bf4ddb62 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -410,7 +410,7 @@ int pagecache_write_end(struct file *, struct address_space *mapping, */ struct address_space { struct inode *host; - struct radix_tree_root pages; + struct xarray pages; gfp_t gfp_mask; atomic_t i_mmap_writable; struct rb_root_cached i_mmap; diff --git a/mm/swap_state.c b/mm/swap_state.c index 7c862258af66..101e952e01e6 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -573,7 +573,7 @@ int init_swap_address_space(unsigned int type, unsigned long nr_pages) return -ENOMEM; for (i = 0; i < nr; i++) { space = spaces + i; - INIT_RADIX_TREE(&space->pages, GFP_ATOMIC|__GFP_NOWARN); + xa_init(&space->pages); atomic_set(&space->i_mmap_writable, 0); space->a_ops = &swap_aops; /* swap cache doesn't use writeback related tags */