Received: by 10.223.185.116 with SMTP id b49csp4136747wrg; Mon, 19 Feb 2018 11:49:48 -0800 (PST) X-Google-Smtp-Source: AH8x225EM0qvq8/rNPuoQOX3NrH9XM55BmdCQ8xFcOU4Qh+ykQAorBxzbsgMVb2w54iaODPJKKiG X-Received: by 2002:a17:902:c6b:: with SMTP id 98-v6mr14771836pls.267.1519069788351; Mon, 19 Feb 2018 11:49:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519069788; cv=none; d=google.com; s=arc-20160816; b=qP/6tzYb0LvXsEBLCpT0oO8MpiUCSlA74V8kioVjc/eSG3kMu1AOMxF8C7qV4FhUp4 UIZeq8WKFaGi458G4Fn+67yz1Q3rBYkzwupLzjy7tzssNf+gC9Rpz3SThpxkS36s4Q0F jIHhwKJgk+2Ytdcqp0g5oGwlDl4iKyNn1pd9QndjV+d0ACcNB6VvD1B59takHG6CIYx1 cOX8yp4vPTmXYDpEauGwy4DhgrfnQJRneCdycnv5dYOMwpNfjTLm0JIidaw8JA6VuJrW JTKRoywiuZEiZNYN7nHEJxCDOrYMg2hiKr+7kEGph1GzUaWWRG2VwKiOLKeqDIGqG7qX 4WOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=SPPJCQdm6L4xeR1STTXIa7jEU7T4ZahbLAmKtWfQjs8=; b=jFe8Z/4XATlbWvOFrRE2Ky9iyeLkcYcKWp5SO8hSkLZLSEOqT8qxVFLj2vlxQ7K4rE mFVsO0g+eA223VkimHomhVA9SWRtxnQTtP1jGlOXC7XmhhFZELa++Xrvmp9L2fyW24WQ L9w/Cs7ZIsH4A5JTkneCigVtBctVUXPZPB6/CMFsEvs+mjy8xF8fhcE1uvdqERv6Tkam TYnl88z5499azRjJqOrKwNf6ygdH+zCU6vxMesaE/qU8E/ggSb8s8e+N/eYwNP8/I1tp c7AZvFVGoza9hAYetPSxF/OpJra2aL6gKdwGSffx8LV4ZOlV+S0hv6phdJTBBzYGevcA G3zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=a0JBHTQ9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p68si7315332pfp.226.2018.02.19.11.49.34; Mon, 19 Feb 2018 11:49:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=a0JBHTQ9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753858AbeBSTsL (ORCPT + 99 others); Mon, 19 Feb 2018 14:48:11 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:45112 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932065AbeBSTqd (ORCPT ); Mon, 19 Feb 2018 14:46:33 -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=SPPJCQdm6L4xeR1STTXIa7jEU7T4ZahbLAmKtWfQjs8=; b=a0JBHTQ9qIEXO1FwsFZmKHJO8 8Fvu9CparWUIq1jAW0vJ1ol0uRloIn+x+/SM2zVEOEFF6ftQ+l6an0qIIU5zBwihA0jASSlY+r5Gi tZGHpKq1eXH2jFmn2ITqalpUrasQDwWbxfhYngGNoupxrFueZgpoW/ZPjbzOqgwkzsRhND2KdyHwt o2cNby9RFm5jqXATLJ34PXcU9JuHx+hMGPeSEOeF6g52TPP33xcbF8nMT1WmsHEfE0lFX1cGEAesi KHR3eCS0ipcME/U0iND2UVgkEyM5LyPMPyZGAOxazDpC4FPWBA9D2CXyL9TmVNzmsB48tmN9BCOPG RBAY6Rc6w==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1enrOS-0001y0-7o; Mon, 19 Feb 2018 19:46:32 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v7 61/61] page cache: Finish XArray conversion Date: Mon, 19 Feb 2018 11:45:56 -0800 Message-Id: <20180219194556.6575-62-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219194556.6575-1-willy@infradead.org> References: <20180219194556.6575-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 07e26909e24d..c1e8d61c9925 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -349,7 +349,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_flags(&mapping->pages, XA_FLAGS_LOCK_IRQ); 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 b134f80ca498..518167152254 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 219e3b4f09e6..25f027d0bb00 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_flags(&space->pages, XA_FLAGS_LOCK_IRQ); atomic_set(&space->i_mmap_writable, 0); space->a_ops = &swap_aops; /* swap cache doesn't use writeback related tags */ -- 2.16.1