From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-331097-1516221598-2-15953913529476795065 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516221597; b=wSGrUbAMvsMn6Agis4BIvhzR61ShyyG9dERlms0OYySPuQu 4RxOfjiphYfnAEgFvmNqs3bdTUCyMhbqlqClKWjMhmGDxWQlHIhECUk4vUK0yDks GRtB/VaJSDM1aC2Jy28y1TafkXYlWk7z6ViZg4Reg99y4eG0V7wTcGKzpNSXjfRF 56dNNDn8fct3z48/0evhaAR+4iT191vjk5Sg2kLsIlsKEXhfJWJV+fExNejmDZhf p+iAt502GvwLcEKy19yqx3E7inYQyjV2/Yq1fcZ2xVlTKgNuticepUOhF9Rl4QMb h1s7TFz1EJ4pL1jAJQANeECyzf9goqj4BDXQcNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516221597; bh=xEE2rKTG7woqKAn/z9jifyl34ZapAsfsbGpUzxWqf7I=; b=esH30Uq5yZ48 P99QJeDsDjVrH/yBUWR7fWFWfG+P2FFgc7zm8FXont0ai6x2++Dpatzx/W3iaWCa B+QxMvyyz6YP74HJm+lhsJgdXSYR/aNx9+AEMawz8b8mss2KfuS2WaP7riiPIKta jQB5rvWCF92u0zXWguHs9SQGtPD7b4hSRQJEKwAQjRpbYihW2FlK1kCxbZZJCzlw cbS6GkqA4OrInk2XaDqW1zuH/PQC9iRzdQhd+LzNAGM43w1zkBfGyMaPqInZy6S3 alMv26upnAIyM1wBtpRzWfWrDjndGwaoSp+44goO6RTA71rCOSqbiUKqMSOcmrxU 4Ohs0hZ/OA== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=aZQCFV6w x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=aZQCFV6w x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932135AbeAQUjc (ORCPT ); Wed, 17 Jan 2018 15:39:32 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:36435 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753791AbeAQUWy (ORCPT ); Wed, 17 Jan 2018 15:22:54 -0500 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , 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, Bjorn Andersson , Stefano Stabellini , iommu@lists.linux-foundation.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, intel-gfx@lists.freedesktop.org, cgroups@vger.kernel.org, linux-sh@vger.kernel.org, David Howells Subject: [PATCH v6 66/99] page cache: Finish XArray conversion Date: Wed, 17 Jan 2018 12:21:30 -0800 Message-Id: <20180117202203.19756-67-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180117202203.19756-1-willy@infradead.org> References: <20180117202203.19756-1-willy@infradead.org> Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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..f5680b805336 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_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 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 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.15.1