]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_db: stop using XFS_BTREE_MAXLEVELS
authorDarrick J. Wong <djwong@kernel.org>
Thu, 6 Jan 2022 22:13:21 +0000 (14:13 -0800)
committerDarrick J. Wong <djwong@kernel.org>
Thu, 20 Jan 2022 00:02:52 +0000 (16:02 -0800)
Use the precomputed per-btree-type max height values.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
db/metadump.c

index af8b67d5a980ca4b7d2cc97a1d348a97f0c2843c..2993f06e9fc7de642be92081c4861468fc4058fd 100644 (file)
@@ -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);
@@ -2672,7 +2672,7 @@ copy_inodes(
                        return 1;
                }
 
-               if (levels > XFS_BTREE_MAXLEVELS) {
+               if (levels > M_IGEO(mp)->inobt_maxlevels) {
                        if (show_warnings)
                                print_warning("invalid level (%u) in finobt "
                                                "root in agi %u", levels, agno);