From patchwork Wed Jan 17 20:21:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10170825 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 62CF560386 for ; Wed, 17 Jan 2018 20:25:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55BCF1FF13 for ; Wed, 17 Jan 2018 20:25:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49C18204FB; Wed, 17 Jan 2018 20:25:55 +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=unavailable 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 CD0DD1FF13 for ; Wed, 17 Jan 2018 20:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754286AbeAQUYs (ORCPT ); Wed, 17 Jan 2018 15:24:48 -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 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=47QaJrwnfsmKeZuf8T8agrYaRD6vhVrtV1ISCmk9vzc=; b=he43x9tj/d3ph3vYT4O5hbH37 RxIhchklIfbFPo4Czmtyw6cvKKsyz77MUSBdGYRhdaTi3H4bM5qaRjLOSqfl7KeXnhNmQYAR36BzV 58qprfxRyvyOhYFvln1StLAND0WsjluqASgdu1qIRC/jDbG6gSzBX/b/aBggA041DumYtiogC9IVR 3zE/XQ5xGHenblRWrxFcwLMg0aqqVL+BTshgfIVHuyFZ61QLhGB8wGtN4vYzSotCnEdl0AAEiF4RU yKrgWi05sRK11Swp6gtCFKSVoYmfHg4zXK0O/QN/CwrxzdGRpvR3xB6RbJ4aO2cZ2n24rIWRJzYv8 rlm8TGk0A==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1ebuEj-0006LX-9n; Wed, 17 Jan 2018 20:23:05 +0000 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-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 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; }; /*