From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-288557-1516220741-2-12640712870593741653 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=1516220741; b=QewTgg5J6tvwAeidNw0GYz8VU3DlKQY9z+KB+C+6gkDTJIt +1+06l68rRS2wej77edyt4yXnucwplPpXsqIrUsxA2+jcGQKBZP/qwR9u5jl96zA 6YAiQnI6lv2wO/wkGj8Z+C/2u1XSX7O/wFjBNEKYjV8Mmnp4CeFjOx7NwM6saCYJ HnEyaQmtsEOgD0PStysRwnLmDD8Q+oPZu7lfAio9dHfL8UW6qXc5Laf4SFmhFFXW 4/9JELLjQLB6JyzO9v+sqvcpVS9H0zvo4bMoJLTCUXEcqZdPjuRAdgNSsKH5nt0A sk5V5BNKgRbhLpgKXqOlKCUMwhbtybx7Sf2UwNQ== 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=1516220741; bh=mf/C2/CMDedBP5OVhvY2cYjhbB7IKKfhHA/zvuhXYKE=; b=TDrel9anCWF5 n280VrW+0POR0sY/XQE1oO2er789oLnC5RSPIX84fVxUBzePxOfIU0jMZvgQyZg4 maQtNV0z/VkueI9rLcHgDHTQET+YcUEL2vMyoFd3SyA8vDd1PFZC9viMMtb2q2xC KcVwb6aDmKdUzE3ueGMjj6znYNeZEBds2wvFjeNKoAzP6q3QKF2uuSlBSg6D+yFz F79b+GxLnnNhKsf7NJAEgQcc0IBGHSUUOA8eMt0gZmiHBEescuobybvKVHtc0M8x eBnMILsZS6ThPRLrtM/AvQ36qFHqC728tiib8KXJGfbOMl8nVjjSPgPVODP4XUUf G5/cM8gsaw== ARC-Authentication-Results: i=1; mx2.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=he43x9tj 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: mx2.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=he43x9tj 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 S1754338AbeAQUYu (ORCPT ); Wed, 17 Jan 2018 15:24:50 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:50703 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754013AbeAQUXG (ORCPT ); Wed, 17 Jan 2018 15:23:06 -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 95/99] f2fs: Convert gclist.iroot to XArray Date: Wed, 17 Jan 2018 12:21:59 -0800 Message-Id: <20180117202203.19756-96-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 Straightforward conversion. Signed-off-by: Matthew Wilcox --- fs/f2fs/gc.c | 14 +++++++------- fs/f2fs/gc.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index aac1e02f75df..2b33068dc36b 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -417,7 +417,7 @@ static struct inode *find_gc_inode(struct gc_inode_list *gc_list, nid_t ino) { struct inode_entry *ie; - ie = radix_tree_lookup(&gc_list->iroot, ino); + ie = xa_load(&gc_list->iroot, ino); if (ie) return ie->inode; return NULL; @@ -434,7 +434,7 @@ static void add_gc_inode(struct gc_inode_list *gc_list, struct inode *inode) new_ie = f2fs_kmem_cache_alloc(inode_entry_slab, GFP_NOFS); new_ie->inode = inode; - f2fs_radix_tree_insert(&gc_list->iroot, inode->i_ino, new_ie); + xa_store(&gc_list->iroot, inode->i_ino, new_ie, GFP_NOFS); list_add_tail(&new_ie->list, &gc_list->ilist); } @@ -442,7 +442,7 @@ static void put_gc_inode(struct gc_inode_list *gc_list) { struct inode_entry *ie, *next_ie; list_for_each_entry_safe(ie, next_ie, &gc_list->ilist, list) { - radix_tree_delete(&gc_list->iroot, ie->inode->i_ino); + xa_erase(&gc_list->iroot, ie->inode->i_ino); iput(ie->inode); list_del(&ie->list); kmem_cache_free(inode_entry_slab, ie); @@ -989,10 +989,10 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, int ret = 0; struct cp_control cpc; unsigned int init_segno = segno; - struct gc_inode_list gc_list = { - .ilist = LIST_HEAD_INIT(gc_list.ilist), - .iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS), - }; + struct gc_inode_list gc_list; + + xa_init(&gc_list.iroot); + INIT_LIST_HEAD(&gc_list.ilist); trace_f2fs_gc_begin(sbi->sb, sync, background, get_pages(sbi, F2FS_DIRTY_NODES), diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h index 9325191fab2d..769259b0a4f6 100644 --- a/fs/f2fs/gc.h +++ b/fs/f2fs/gc.h @@ -41,7 +41,7 @@ struct f2fs_gc_kthread { struct gc_inode_list { struct list_head ilist; - struct radix_tree_root iroot; + struct xarray iroot; }; /* -- 2.15.1