[v6,95/99] f2fs: Convert gclist.iroot to XArray

Commit Message

Matthew Wilcox (Oracle) Jan. 17, 2018, 8:21 p.m. UTC

From: Matthew Wilcox <[e-mail]>

Straightforward conversion.

Signed-off-by: Matthew Wilcox <[e-mail]>
---
 fs/f2fs/gc.c | 14 +++++++-------
 fs/f2fs/gc.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

Patch

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;
 };
 
 /*