diff mbox series

[29/48] xfs_repair: stop using XFS_BTREE_MAXLEVELS

Message ID 164263835190.865554.2981692152783837289.stgit@magnolia (mailing list archive)
State Accepted
Headers show
Series xfsprogs: sync libxfs with 5.16 | expand

Commit Message

Darrick J. Wong Jan. 20, 2022, 12:25 a.m. UTC 
From: Darrick J. Wong <djwong@kernel.org>

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

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 repair/scan.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/repair/scan.c b/repair/scan.c
index e7bf1fde..5a4b8dbd 100644
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -2264,7 +2264,7 @@  validate_agf(
 	unsigned int		levels;
 
 	levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]);
-	if (levels == 0 || levels > XFS_BTREE_MAXLEVELS) {
+	if (levels == 0 || levels > mp->m_alloc_maxlevels) {
 		do_warn(_("bad levels %u for btbno root, agno %d\n"),
 			levels, agno);
 	}
@@ -2282,7 +2282,7 @@  validate_agf(
 	}
 
 	levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]);
-	if (levels == 0 || levels > XFS_BTREE_MAXLEVELS) {
+	if (levels == 0 || levels > mp->m_alloc_maxlevels) {
 		do_warn(_("bad levels %u for btbcnt root, agno %d\n"),
 			levels, agno);
 	}
@@ -2309,7 +2309,7 @@  validate_agf(
 		priv.nr_blocks = 0;
 
 		levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]);
-		if (levels == 0 || levels > XFS_BTREE_MAXLEVELS) {
+		if (levels == 0 || levels > mp->m_rmap_maxlevels) {
 			do_warn(_("bad levels %u for rmapbt root, agno %d\n"),
 				levels, agno);
 			rmap_avoid_check();
@@ -2333,7 +2333,7 @@  validate_agf(
 
 	if (xfs_has_reflink(mp)) {
 		levels = be32_to_cpu(agf->agf_refcount_level);
-		if (levels == 0 || levels > XFS_BTREE_MAXLEVELS) {
+		if (levels == 0 || levels > mp->m_refc_maxlevels) {
 			do_warn(_("bad levels %u for refcountbt root, agno %d\n"),
 				levels, agno);
 			refcount_avoid_check();
@@ -2391,7 +2391,7 @@  validate_agi(
 	unsigned int		levels;
 
 	levels = be32_to_cpu(agi->agi_level);
-	if (levels == 0 || levels > XFS_BTREE_MAXLEVELS) {
+	if (levels == 0 || levels > M_IGEO(mp)->inobt_maxlevels) {
 		do_warn(_("bad levels %u for inobt root, agno %d\n"),
 			levels, agno);
 	}
@@ -2410,7 +2410,7 @@  validate_agi(
 
 	if (xfs_has_finobt(mp)) {
 		levels = be32_to_cpu(agi->agi_free_level);
-		if (levels == 0 || levels > XFS_BTREE_MAXLEVELS) {
+		if (levels == 0 || levels > M_IGEO(mp)->inobt_maxlevels) {
 			do_warn(_("bad levels %u for finobt root, agno %d\n"),
 				levels, agno);
 		}