xfs: rename m_ag_maxlevels to m_allocbt_maxlevels

Source kernel commit: 7cb3efb4cfdd4f3eb1f36b0ce39254b848ff2371

Years ago when XFS was thought to be much more simple, we introduced
m_ag_maxlevels to specify the maximum btree height of per-AG btrees for
a given filesystem mount.  Then we observed that inode btrees don't
actually have the same height and split that off; and now we have rmap
and refcount btrees with much different geometries and separate
maxlevels variables.

The 'ag' part of the name doesn't make much sense anymore, so rename
this to m_alloc_maxlevels to reinforce that this is the maximum height
of the *free space* btrees.  This sets us up for the next patch, which
will add a variable to track the maximum height of all AG btrees.

(Also take the opportunity to improve adjacent comments and fix minor
style problems.)

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

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index f3c03833be677917678ff9e34d1d4b1c56b5df7e..4d77e6093a3a780d64527fe752ed7a8db4967ef8 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -71,8 +71,8 @@ typedef struct xfs_mount {
        uint                    m_rmap_mnr[2];  /* min rmap btree records */
        uint                    m_refc_mxr[2];  /* max refc btree records */
        uint                    m_refc_mnr[2];  /* min refc btree records */
-       uint                    m_ag_maxlevels; /* XFS_AG_MAXLEVELS */
-       uint                    m_bm_maxlevels[2]; /* XFS_BM_MAXLEVELS */
+       uint                    m_alloc_maxlevels; /* max alloc btree levels */
+       uint                    m_bm_maxlevels[2];  /* max bmap btree levels */
        uint                    m_rmap_maxlevels; /* max rmap btree levels */
        uint                    m_refc_maxlevels; /* max refc btree levels */
        xfs_extlen_t            m_ag_prealloc_blocks; /* reserved ag blocks */

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index b8857204d4d3cb64790cc87a210f5a84a4109345..e20d8fb744c6aad63d462caa6a5dfb820a8df1f1 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2186,13 +2186,13 @@ xfs_free_ag_extent(
  */
 
 /*
- * Compute and fill in value of m_ag_maxlevels.
+ * Compute and fill in value of m_alloc_maxlevels.
  */
 void
 xfs_alloc_compute_maxlevels(
        xfs_mount_t     *mp)    /* file system mount structure */
 {
-       mp->m_ag_maxlevels = xfs_btree_compute_maxlevels(mp->m_alloc_mnr,
+       mp->m_alloc_maxlevels = xfs_btree_compute_maxlevels(mp->m_alloc_mnr,
                        (mp->m_sb.sb_agblocks + 1) / 2);
 }
 
@@ -2251,14 +2251,14 @@ xfs_alloc_min_freelist(
        const uint8_t           *levels = pag ? pag->pagf_levels : fake_levels;
        unsigned int            min_free;
 
-       ASSERT(mp->m_ag_maxlevels > 0);
+       ASSERT(mp->m_alloc_maxlevels > 0);
 
        /* space needed by-bno freespace btree */
        min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1,
-                                      mp->m_ag_maxlevels);
+                                      mp->m_alloc_maxlevels);
        /* space needed by-size freespace btree */
        min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1,
-                                      mp->m_ag_maxlevels);
+                                      mp->m_alloc_maxlevels);
        /* space needed reverse mapping used space btree */
        if (xfs_has_rmapbt(mp))
                min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1,
@@ -2899,13 +2899,16 @@ xfs_agf_verify(
 
        if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) < 1 ||
            be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) < 1 ||
-           be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) > mp->m_ag_maxlevels ||
-           be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) > mp->m_ag_maxlevels)
+           be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) >
+                                               mp->m_alloc_maxlevels ||
+           be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) >
+                                               mp->m_alloc_maxlevels)
                return __this_address;
 
        if (xfs_has_rmapbt(mp) &&
            (be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) < 1 ||
-            be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > mp->m_rmap_maxlevels))
+            be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) >
+                                               mp->m_rmap_maxlevels))
                return __this_address;
 
        if (xfs_has_rmapbt(mp) &&

diff --git a/libxfs/xfs_alloc.h b/libxfs/xfs_alloc.h
index df4aefaf0046e818b49a87b1fdc35b2a00398de9..2f3f8c2e08600240fcc86db6fbf82137a25b063d 100644 (file)
--- a/libxfs/xfs_alloc.h
+++ b/libxfs/xfs_alloc.h
@@ -98,7 +98,7 @@ unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp,
                struct xfs_perag *pag);
 
 /*
- * Compute and fill in value of m_ag_maxlevels.
+ * Compute and fill in value of m_alloc_maxlevels.
  */
 void
 xfs_alloc_compute_maxlevels(

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index c1030ad1ce82255944321125bf1b92236c9c96e8..d752500bea5b838216a14d14f5cebde5d1333abe 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -314,7 +314,7 @@ xfs_allocbt_verify(
        if (pag && pag->pagf_init) {
                if (level >= pag->pagf_levels[btnum])
                        return __this_address;
-       } else if (level >= mp->m_ag_maxlevels)
+       } else if (level >= mp->m_alloc_maxlevels)
                return __this_address;
 
        return xfs_btree_sblock_verify(bp, mp->m_alloc_mxr[level != 0]);
@@ -475,7 +475,7 @@ xfs_allocbt_init_common(
 
        ASSERT(btnum == XFS_BTNUM_BNO || btnum == XFS_BTNUM_CNT);
 
-       cur = xfs_btree_alloc_cursor(mp, tp, btnum, mp->m_ag_maxlevels);
+       cur = xfs_btree_alloc_cursor(mp, tp, btnum, mp->m_alloc_maxlevels);
        cur->bc_ag.abt.active = false;
 
        if (btnum == XFS_BTNUM_CNT) {

diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c
index d383528df0457cc48a22c8f789a8b207abd3c9f6..68daefd417372dd678a4859f1ce5f3e03c105ee4 100644 (file)
--- a/libxfs/xfs_trans_resv.c
+++ b/libxfs/xfs_trans_resv.c
@@ -69,7 +69,7 @@ xfs_allocfree_log_count(
 {
        uint            blocks;
 
-       blocks = num_ops * 2 * (2 * mp->m_ag_maxlevels - 1);
+       blocks = num_ops * 2 * (2 * mp->m_alloc_maxlevels - 1);
        if (xfs_has_rmapbt(mp))
                blocks += num_ops * (2 * mp->m_rmap_maxlevels - 1);
        if (xfs_has_reflink(mp))

diff --git a/libxfs/xfs_trans_space.h b/libxfs/xfs_trans_space.h
index 50332be343881e88c8211087741450ae480efd9b..bd04cb836419ebbea52f2d7c9a23ba6e1dff8ff0 100644 (file)
--- a/libxfs/xfs_trans_space.h
+++ b/libxfs/xfs_trans_space.h
@@ -74,7 +74,7 @@
 #define        XFS_DIOSTRAT_SPACE_RES(mp, v)   \
        (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + (v))
 #define        XFS_GROWFS_SPACE_RES(mp)        \
-       (2 * (mp)->m_ag_maxlevels)
+       (2 * (mp)->m_alloc_maxlevels)
 #define        XFS_GROWFSRT_SPACE_RES(mp,b)    \
        ((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK))
 #define        XFS_LINK_SPACE_RES(mp,nl)       \