From: Christoph Hellwig <hch@lst.de>
Date: Tue, 20 Aug 2024 11:57:38 +0000 (+0200)
Subject: fixups
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fxfs-rtg-xarray;p=users%2Fhch%2Fxfsprogs.git

fixups
---

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 31af535cd..a523055b9 100644
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -96,7 +96,7 @@ typedef struct xfs_mount {
 	uint			m_alloc_set_aside; /* space we can't use */
 	uint			m_ag_max_usable; /* max space per AG */
 	struct radix_tree_root	m_perag_tree;
-	struct radix_tree_root	m_rtgroup_tree;
+	struct xarray		m_rtgroups;
 	uint64_t		m_features;	/* active filesystem features */
 	uint64_t		m_low_space[XFS_LOWSP_MAX];
 	uint64_t		m_rtxblkmask;	/* rt extent block mask */
@@ -137,7 +137,6 @@ typedef struct xfs_mount {
 	 */
 	atomic64_t		m_allocbt_blks;
 	spinlock_t		m_perag_lock;	/* lock for m_perag_tree */
-	spinlock_t		m_rtgroup_lock;	/* lock for m_rtgroup_tree */
 
 } xfs_mount_t;
 
diff --git a/libxfs/init.c b/libxfs/init.c
index 764c46458..577f1b682 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -735,11 +735,10 @@ libxfs_mount(
 	xfs_set_inode32(mp);
 	mp->m_sb = *sb;
 	INIT_RADIX_TREE(&mp->m_perag_tree, GFP_KERNEL);
-	INIT_RADIX_TREE(&mp->m_rtgroup_tree, GFP_KERNEL);
+	xa_init(&mp->m_rtgroups);
 	sbp = &mp->m_sb;
 	spin_lock_init(&mp->m_sb_lock);
 	spin_lock_init(&mp->m_agirotor_lock);
-	spin_lock_init(&mp->m_rtgroup_lock);
 
 	xfs_sb_mount_common(mp, sb);