From: Darrick J. Wong <djwong@kernel.org>
Date: Thu, 28 Apr 2022 19:39:03 +0000 (-0400)
Subject: xfs_db: stop using XFS_BTREE_MAXLEVELS
X-Git-Tag: v5.16.0-rc0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=716b497a0b075907178e86fdacdf3578d20e3e8f;p=thirdparty%2Fxfsprogs-dev.git

xfs_db: stop using XFS_BTREE_MAXLEVELS

Use the precomputed per-btree-type max height values.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/db/metadump.c b/db/metadump.c
index d71d3e983..c6f9d382a 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -487,7 +487,7 @@ copy_free_bno_btree(
 					"root in agf %u", root, agno);
 		return 1;
 	}
-	if (levels > XFS_BTREE_MAXLEVELS) {
+	if (levels > mp->m_alloc_maxlevels) {
 		if (show_warnings)
 			print_warning("invalid level (%u) in bnobt root "
 					"in agf %u", levels, agno);
@@ -515,7 +515,7 @@ copy_free_cnt_btree(
 					"root in agf %u", root, agno);
 		return 1;
 	}
-	if (levels > XFS_BTREE_MAXLEVELS) {
+	if (levels > mp->m_alloc_maxlevels) {
 		if (show_warnings)
 			print_warning("invalid level (%u) in cntbt root "
 					"in agf %u", levels, agno);
@@ -587,7 +587,7 @@ copy_rmap_btree(
 					"root in agf %u", root, agno);
 		return 1;
 	}
-	if (levels > XFS_BTREE_MAXLEVELS) {
+	if (levels > mp->m_rmap_maxlevels) {
 		if (show_warnings)
 			print_warning("invalid level (%u) in rmapbt root "
 					"in agf %u", levels, agno);
@@ -659,7 +659,7 @@ copy_refcount_btree(
 					"root in agf %u", root, agno);
 		return 1;
 	}
-	if (levels > XFS_BTREE_MAXLEVELS) {
+	if (levels > mp->m_refc_maxlevels) {
 		if (show_warnings)
 			print_warning("invalid level (%u) in refcntbt root "
 					"in agf %u", levels, agno);
@@ -2650,7 +2650,7 @@ copy_inodes(
 					"root in agi %u", root, agno);
 		return 1;
 	}
-	if (levels > XFS_BTREE_MAXLEVELS) {
+	if (levels > M_IGEO(mp)->inobt_maxlevels) {
 		if (show_warnings)
 			print_warning("invalid level (%u) in inobt root "
 					"in agi %u", levels, agno);