xfs: split the agf_roots and agf_levels arrays

Using arrays of largely unrelated fields that use the btree number
as index is not very robust.  Split the arrays into three separate
fields instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c
index 446733893764911f5f359aff810cbbe401e88afe..e598e14320be65f9d9b87bece0193c0877dcc3e4 100644 (file)
--- a/fs/xfs/libxfs/xfs_ag.c
+++ b/fs/xfs/libxfs/xfs_ag.c
@@ -669,14 +669,13 @@ xfs_agfblock_init(
        agf->agf_versionnum = cpu_to_be32(XFS_AGF_VERSION);
        agf->agf_seqno = cpu_to_be32(id->agno);
        agf->agf_length = cpu_to_be32(id->agsize);
-       agf->agf_roots[XFS_BTNUM_BNOi] = cpu_to_be32(XFS_BNO_BLOCK(mp));
-       agf->agf_roots[XFS_BTNUM_CNTi] = cpu_to_be32(XFS_CNT_BLOCK(mp));
-       agf->agf_levels[XFS_BTNUM_BNOi] = cpu_to_be32(1);
-       agf->agf_levels[XFS_BTNUM_CNTi] = cpu_to_be32(1);
+       agf->agf_bno_root = cpu_to_be32(XFS_BNO_BLOCK(mp));
+       agf->agf_cnt_root = cpu_to_be32(XFS_CNT_BLOCK(mp));
+       agf->agf_bno_level = cpu_to_be32(1);
+       agf->agf_cnt_level = cpu_to_be32(1);
        if (xfs_has_rmapbt(mp)) {
-               agf->agf_roots[XFS_BTNUM_RMAPi] =
-                                       cpu_to_be32(XFS_RMAP_BLOCK(mp));
-               agf->agf_levels[XFS_BTNUM_RMAPi] = cpu_to_be32(1);
+               agf->agf_rmap_root = cpu_to_be32(XFS_RMAP_BLOCK(mp));
+               agf->agf_rmap_level = cpu_to_be32(1);
                agf->agf_rmap_blocks = cpu_to_be32(1);
        }
 

diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h
index 77c0fa2bb510c24a3382f87a055e69483f5f052b..19eddba098941d4a4cbc9a047052bd0c881c3c80 100644 (file)
--- a/fs/xfs/libxfs/xfs_ag.h
+++ b/fs/xfs/libxfs/xfs_ag.h
@@ -36,8 +36,9 @@ struct xfs_perag {
        atomic_t        pag_active_ref; /* active reference count */
        wait_queue_head_t pag_active_wq;/* woken active_ref falls to zero */
        unsigned long   pag_opstate;
-       uint8_t         pagf_levels[XFS_BTNUM_AGF];
-                                       /* # of levels in bno & cnt btree */
+       uint8_t         pagf_bno_level; /* # of levels in bno btree */
+       uint8_t         pagf_cnt_level; /* # of levels in cnt btree */
+       uint8_t         pagf_rmap_level;/* # of levels in rmap btree */
        uint32_t        pagf_flcount;   /* count of blocks in freelist */
        xfs_extlen_t    pagf_freeblks;  /* total free blocks */
        xfs_extlen_t    pagf_longest;   /* longest free space */
@@ -86,7 +87,8 @@ struct xfs_perag {
         * Alternate btree heights so that online repair won't trip the write
         * verifiers while rebuilding the AG btrees.
         */
-       uint8_t         pagf_repair_levels[XFS_BTNUM_AGF];
+       uint8_t         pagf_repair_bno_level;
+       uint8_t         pagf_repair_cnt_level;
        uint8_t         pagf_repair_refcount_level;
 #endif
 

diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index 91553a54dc30aa1b6de5d85e4cff06a7b46bce2f..7300dc21958967f9a56436ac31349caf7118f84e 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2335,8 +2335,9 @@ xfs_alloc_min_freelist(
        struct xfs_perag        *pag)
 {
        /* AG btrees have at least 1 level. */
-       static const uint8_t    fake_levels[XFS_BTNUM_AGF] = {1, 1, 1};
-       const uint8_t           *levels = pag ? pag->pagf_levels : fake_levels;
+       const unsigned int      bno_level = pag ? pag->pagf_bno_level : 1;
+       const unsigned int      cnt_level = pag ? pag->pagf_cnt_level : 1;
+       const unsigned int      rmap_level = pag ? pag->pagf_rmap_level : 1;
        unsigned int            min_free;
 
        ASSERT(mp->m_alloc_maxlevels > 0);
@@ -2363,16 +2364,12 @@ xfs_alloc_min_freelist(
         */
 
        /* space needed by-bno freespace btree */
-       min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1,
-                                      mp->m_alloc_maxlevels) * 2 - 2;
+       min_free = min(bno_level + 1, mp->m_alloc_maxlevels) * 2 - 2;
        /* space needed by-size freespace btree */
-       min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1,
-                                      mp->m_alloc_maxlevels) * 2 - 2;
+       min_free += min(cnt_level + 1, mp->m_alloc_maxlevels) * 2 - 2;
        /* space needed reverse mapping used space btree */
        if (xfs_has_rmapbt(mp))
-               min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1,
-                                               mp->m_rmap_maxlevels) * 2 - 2;
-
+               min_free += min(rmap_level + 1, mp->m_rmap_maxlevels) * 2 - 2;
        return min_free;
 }
 
@@ -3056,8 +3053,8 @@ xfs_alloc_log_agf(
                offsetof(xfs_agf_t, agf_versionnum),
                offsetof(xfs_agf_t, agf_seqno),
                offsetof(xfs_agf_t, agf_length),
-               offsetof(xfs_agf_t, agf_roots[0]),
-               offsetof(xfs_agf_t, agf_levels[0]),
+               offsetof(xfs_agf_t, agf_bno_root),   /* also cnt/rmap root */
+               offsetof(xfs_agf_t, agf_bno_level),  /* also cnt/rmap levels */
                offsetof(xfs_agf_t, agf_flfirst),
                offsetof(xfs_agf_t, agf_fllast),
                offsetof(xfs_agf_t, agf_flcount),
@@ -3236,12 +3233,10 @@ xfs_agf_verify(
            be32_to_cpu(agf->agf_freeblks) > agf_length)
                return __this_address;
 
-       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_alloc_maxlevels ||
-           be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) >
-                                               mp->m_alloc_maxlevels)
+       if (be32_to_cpu(agf->agf_bno_level) < 1 ||
+           be32_to_cpu(agf->agf_cnt_level) < 1 ||
+           be32_to_cpu(agf->agf_bno_level) > mp->m_alloc_maxlevels ||
+           be32_to_cpu(agf->agf_cnt_level) > mp->m_alloc_maxlevels)
                return __this_address;
 
        if (xfs_has_lazysbcount(mp) &&
@@ -3252,9 +3247,8 @@ xfs_agf_verify(
                if (be32_to_cpu(agf->agf_rmap_blocks) > agf_length)
                        return __this_address;
 
-               if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) < 1 ||
-                   be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) >
-                                                       mp->m_rmap_maxlevels)
+               if (be32_to_cpu(agf->agf_rmap_level) < 1 ||
+                   be32_to_cpu(agf->agf_rmap_level) > mp->m_rmap_maxlevels)
                        return __this_address;
        }
 
@@ -3380,12 +3374,9 @@ xfs_alloc_read_agf(
                pag->pagf_btreeblks = be32_to_cpu(agf->agf_btreeblks);
                pag->pagf_flcount = be32_to_cpu(agf->agf_flcount);
                pag->pagf_longest = be32_to_cpu(agf->agf_longest);
-               pag->pagf_levels[XFS_BTNUM_BNOi] =
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]);
-               pag->pagf_levels[XFS_BTNUM_CNTi] =
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]);
-               pag->pagf_levels[XFS_BTNUM_RMAPi] =
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAPi]);
+               pag->pagf_bno_level = be32_to_cpu(agf->agf_bno_level);
+               pag->pagf_cnt_level = be32_to_cpu(agf->agf_cnt_level);
+               pag->pagf_rmap_level = be32_to_cpu(agf->agf_rmap_level);
                pag->pagf_refcount_level = be32_to_cpu(agf->agf_refcount_level);
                if (xfs_agfl_needs_reset(pag->pag_mount, agf))
                        set_bit(XFS_AGSTATE_AGFL_NEEDS_RESET, &pag->pag_opstate);
@@ -3414,10 +3405,8 @@ xfs_alloc_read_agf(
                ASSERT(pag->pagf_btreeblks == be32_to_cpu(agf->agf_btreeblks));
                ASSERT(pag->pagf_flcount == be32_to_cpu(agf->agf_flcount));
                ASSERT(pag->pagf_longest == be32_to_cpu(agf->agf_longest));
-               ASSERT(pag->pagf_levels[XFS_BTNUM_BNOi] ==
-                      be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]));
-               ASSERT(pag->pagf_levels[XFS_BTNUM_CNTi] ==
-                      be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]));
+               ASSERT(pag->pagf_bno_level == be32_to_cpu(agf->agf_bno_level));
+               ASSERT(pag->pagf_cnt_level == be32_to_cpu(agf->agf_cnt_level));
        }
 #endif
        if (agfbpp)

diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c
index 99859803bb0b8ec11d20982e249fbf8ea67d96a5..6c09573a98a9a79968afe84c435751797015c2fc 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc_btree.c
+++ b/fs/xfs/libxfs/xfs_alloc_btree.c
@@ -38,13 +38,18 @@ xfs_allocbt_set_root(
 {
        struct xfs_buf          *agbp = cur->bc_ag.agbp;
        struct xfs_agf          *agf = agbp->b_addr;
-       int                     btnum = cur->bc_btnum;
 
        ASSERT(ptr->s != 0);
 
-       agf->agf_roots[btnum] = ptr->s;
-       be32_add_cpu(&agf->agf_levels[btnum], inc);
-       cur->bc_ag.pag->pagf_levels[btnum] += inc;
+       if (cur->bc_btnum == XFS_BTNUM_BNO) {
+               agf->agf_bno_root = ptr->s;
+               be32_add_cpu(&agf->agf_bno_level, inc);
+               cur->bc_ag.pag->pagf_bno_level += inc;
+       } else {
+               agf->agf_cnt_root = ptr->s;
+               be32_add_cpu(&agf->agf_cnt_level, inc);
+               cur->bc_ag.pag->pagf_cnt_level += inc;
+       }
 
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS);
 }
@@ -226,7 +231,10 @@ xfs_allocbt_init_ptr_from_cur(
 
        ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno));
 
-       ptr->s = agf->agf_roots[cur->bc_btnum];
+       if (cur->bc_btnum == XFS_BTNUM_BNO)
+               ptr->s = agf->agf_bno_root;
+       else
+               ptr->s = agf->agf_cnt_root;
 }
 
 STATIC int64_t
@@ -299,7 +307,6 @@ xfs_allocbt_verify(
        struct xfs_perag        *pag = bp->b_pag;
        xfs_failaddr_t          fa;
        unsigned int            level;
-       xfs_btnum_t             btnum = XFS_BTNUM_BNOi;
 
        if (!xfs_verify_magic(bp, block->bb_magic))
                return __this_address;
@@ -320,21 +327,27 @@ xfs_allocbt_verify(
         * against.
         */
        level = be16_to_cpu(block->bb_level);
-       if (bp->b_ops->magic[0] == cpu_to_be32(XFS_ABTC_MAGIC))
-               btnum = XFS_BTNUM_CNTi;
        if (pag && xfs_perag_initialised_agf(pag)) {
-               unsigned int    maxlevel = pag->pagf_levels[btnum];
+               unsigned int    maxlevel, repair_maxlevel = 0;
 
-#ifdef CONFIG_XFS_ONLINE_REPAIR
                /*
                 * Online repair could be rewriting the free space btrees, so
                 * we'll validate against the larger of either tree while this
                 * is going on.
                 */
-               maxlevel = max_t(unsigned int, maxlevel,
-                                pag->pagf_repair_levels[btnum]);
+               if (bp->b_ops->magic[0] == cpu_to_be32(XFS_ABTC_MAGIC)) {
+                       maxlevel = pag->pagf_cnt_level;
+#ifdef CONFIG_XFS_ONLINE_REPAIR
+                       repair_maxlevel = pag->pagf_repair_cnt_level;
 #endif
-               if (level >= maxlevel)
+               } else {
+                       maxlevel = pag->pagf_bno_level;
+#ifdef CONFIG_XFS_ONLINE_REPAIR
+                       repair_maxlevel = pag->pagf_repair_bno_level;
+#endif
+               }
+
+               if (level >= max(maxlevel, repair_maxlevel))
                        return __this_address;
        } else if (level >= mp->m_alloc_maxlevels)
                return __this_address;
@@ -542,8 +555,8 @@ xfs_allocbt_init_cursor(
                struct xfs_agf          *agf = agbp->b_addr;
 
                cur->bc_nlevels = (btnum == XFS_BTNUM_BNO) ?
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) :
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]);
+                       be32_to_cpu(agf->agf_bno_level) :
+                       be32_to_cpu(agf->agf_cnt_level);
        }
        return cur;
 }
@@ -563,8 +576,13 @@ xfs_allocbt_commit_staged_btree(
 
        ASSERT(cur->bc_flags & XFS_BTREE_STAGING);
 
-       agf->agf_roots[cur->bc_btnum] = cpu_to_be32(afake->af_root);
-       agf->agf_levels[cur->bc_btnum] = cpu_to_be32(afake->af_levels);
+       if (cur->bc_btnum == XFS_BTNUM_BNO) {
+               agf->agf_bno_root = cpu_to_be32(afake->af_root);
+               agf->agf_bno_level = cpu_to_be32(afake->af_levels);
+       } else {
+               agf->agf_cnt_root = cpu_to_be32(afake->af_root);
+               agf->agf_cnt_level = cpu_to_be32(afake->af_levels);
+       }
        xfs_alloc_log_agf(tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS);
 
        xfs_btree_commit_afakeroot(cur, tp, agbp);

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 382ab1e71c0b6c43b74a937ed9e935967253a858..2b2f9050fbfbbc67ab0d46690ddf3d5963bc7206 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -477,15 +477,9 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
 #define        XFS_AGI_GOOD_VERSION(v) ((v) == XFS_AGI_VERSION)
 
 /*
- * Btree number 0 is bno, 1 is cnt, 2 is rmap. This value gives the size of the
- * arrays below.
- */
-#define        XFS_BTNUM_AGF   ((int)XFS_BTNUM_RMAPi + 1)
-
-/*
- * The second word of agf_levels in the first a.g. overlaps the EFS
- * superblock's magic number.  Since the magic numbers valid for EFS
- * are > 64k, our value cannot be confused for an EFS superblock's.
+ * agf_cnt_level in the first AGF overlaps the EFS superblock's magic number.
+ * Since the magic numbers valid for EFS are > 64k, our value cannot be confused
+ * for an EFS superblock.
  */
 
 typedef struct xfs_agf {
@@ -499,8 +493,13 @@ typedef struct xfs_agf {
        /*
         * Freespace and rmap information
         */
-       __be32          agf_roots[XFS_BTNUM_AGF];       /* root blocks */
-       __be32          agf_levels[XFS_BTNUM_AGF];      /* btree levels */
+       __be32          agf_bno_root;   /* bnobt root block */
+       __be32          agf_cnt_root;   /* cntbt root block */
+       __be32          agf_rmap_root;  /* rmapbt root block */
+
+       __be32          agf_bno_level;  /* bnobt btree levels */
+       __be32          agf_cnt_level;  /* cntbt btree levels */
+       __be32          agf_rmap_level; /* rmapbt btree levels */
 
        __be32          agf_flfirst;    /* first freelist block's index */
        __be32          agf_fllast;     /* last freelist block's index */

diff --git a/fs/xfs/libxfs/xfs_rmap_btree.c b/fs/xfs/libxfs/xfs_rmap_btree.c
index b0da31f49ca8cb1484505780aa3ca0a0e3d6d162..e050d7342d6c918b4bf47123b9d0be47e59f7c61 100644 (file)
--- a/fs/xfs/libxfs/xfs_rmap_btree.c
+++ b/fs/xfs/libxfs/xfs_rmap_btree.c
@@ -65,13 +65,12 @@ xfs_rmapbt_set_root(
 {
        struct xfs_buf          *agbp = cur->bc_ag.agbp;
        struct xfs_agf          *agf = agbp->b_addr;
-       int                     btnum = cur->bc_btnum;
 
        ASSERT(ptr->s != 0);
 
-       agf->agf_roots[btnum] = ptr->s;
-       be32_add_cpu(&agf->agf_levels[btnum], inc);
-       cur->bc_ag.pag->pagf_levels[btnum] += inc;
+       agf->agf_rmap_root = ptr->s;
+       be32_add_cpu(&agf->agf_rmap_level, inc);
+       cur->bc_ag.pag->pagf_rmap_level += inc;
 
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS);
 }
@@ -222,7 +221,7 @@ xfs_rmapbt_init_ptr_from_cur(
 
        ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno));
 
-       ptr->s = agf->agf_roots[cur->bc_btnum];
+       ptr->s = agf->agf_rmap_root;
 }
 
 /*
@@ -342,7 +341,7 @@ xfs_rmapbt_verify(
 
        level = be16_to_cpu(block->bb_level);
        if (pag && xfs_perag_initialised_agf(pag)) {
-               if (level >= pag->pagf_levels[XFS_BTNUM_RMAPi])
+               if (level >= pag->pagf_rmap_level)
                        return __this_address;
        } else if (level >= mp->m_rmap_maxlevels)
                return __this_address;
@@ -523,7 +522,7 @@ xfs_rmapbt_init_cursor(
        if (agbp) {
                struct xfs_agf          *agf = agbp->b_addr;
 
-               cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]);
+               cur->bc_nlevels = be32_to_cpu(agf->agf_rmap_level);
        }
        return cur;
 }
@@ -543,8 +542,8 @@ xfs_rmapbt_commit_staged_btree(
 
        ASSERT(cur->bc_flags & XFS_BTREE_STAGING);
 
-       agf->agf_roots[cur->bc_btnum] = cpu_to_be32(afake->af_root);
-       agf->agf_levels[cur->bc_btnum] = cpu_to_be32(afake->af_levels);
+       agf->agf_rmap_root = cpu_to_be32(afake->af_root);
+       agf->agf_rmap_level = cpu_to_be32(afake->af_levels);
        agf->agf_rmap_blocks = cpu_to_be32(afake->af_blocks);
        xfs_alloc_log_agf(tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS |
                                    XFS_AGF_RMAP_BLOCKS);

diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c
index 6c6e5eba42c8ba69419d896d8f53bf8695d83d72..e954f07679dd785f9ccead8118e900ea1a9ffbbe 100644 (file)
--- a/fs/xfs/scrub/agheader.c
+++ b/fs/xfs/scrub/agheader.c
@@ -556,28 +556,28 @@ xchk_agf(
                xchk_block_set_corrupt(sc, sc->sa.agf_bp);
 
        /* Check the AGF btree roots and levels */
-       agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]);
+       agbno = be32_to_cpu(agf->agf_bno_root);
        if (!xfs_verify_agbno(pag, agbno))
                xchk_block_set_corrupt(sc, sc->sa.agf_bp);
 
-       agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]);
+       agbno = be32_to_cpu(agf->agf_cnt_root);
        if (!xfs_verify_agbno(pag, agbno))
                xchk_block_set_corrupt(sc, sc->sa.agf_bp);
 
-       level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]);
+       level = be32_to_cpu(agf->agf_bno_level);
        if (level <= 0 || level > mp->m_alloc_maxlevels)
                xchk_block_set_corrupt(sc, sc->sa.agf_bp);
 
-       level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]);
+       level = be32_to_cpu(agf->agf_cnt_level);
        if (level <= 0 || level > mp->m_alloc_maxlevels)
                xchk_block_set_corrupt(sc, sc->sa.agf_bp);
 
        if (xfs_has_rmapbt(mp)) {
-               agbno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_RMAP]);
+               agbno = be32_to_cpu(agf->agf_rmap_root);
                if (!xfs_verify_agbno(pag, agbno))
                        xchk_block_set_corrupt(sc, sc->sa.agf_bp);
 
-               level = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]);
+               level = be32_to_cpu(agf->agf_rmap_level);
                if (level <= 0 || level > mp->m_rmap_maxlevels)
                        xchk_block_set_corrupt(sc, sc->sa.agf_bp);
        }

diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c
index 26bd1ff68f1bed61a55a82f9583845acc2a657bf..e4dd4fe84c5f944c991ab1f31eec8c6c971425f6 100644 (file)
--- a/fs/xfs/scrub/agheader_repair.c
+++ b/fs/xfs/scrub/agheader_repair.c
@@ -174,8 +174,7 @@ xrep_agf_find_btrees(
         * We relied on the rmapbt to reconstruct the AGF.  If we get a
         * different root then something's seriously wrong.
         */
-       if (fab[XREP_AGF_RMAPBT].root !=
-           be32_to_cpu(old_agf->agf_roots[XFS_BTNUM_RMAPi]))
+       if (fab[XREP_AGF_RMAPBT].root != be32_to_cpu(old_agf->agf_rmap_root))
                return -EFSCORRUPTED;
 
        /* We must find the refcountbt root if that feature is enabled. */
@@ -224,20 +223,14 @@ xrep_agf_set_roots(
        struct xfs_agf                  *agf,
        struct xrep_find_ag_btree       *fab)
 {
-       agf->agf_roots[XFS_BTNUM_BNOi] =
-                       cpu_to_be32(fab[XREP_AGF_BNOBT].root);
-       agf->agf_levels[XFS_BTNUM_BNOi] =
-                       cpu_to_be32(fab[XREP_AGF_BNOBT].height);
+       agf->agf_bno_root = cpu_to_be32(fab[XREP_AGF_BNOBT].root);
+       agf->agf_bno_level = cpu_to_be32(fab[XREP_AGF_BNOBT].height);
 
-       agf->agf_roots[XFS_BTNUM_CNTi] =
-                       cpu_to_be32(fab[XREP_AGF_CNTBT].root);
-       agf->agf_levels[XFS_BTNUM_CNTi] =
-                       cpu_to_be32(fab[XREP_AGF_CNTBT].height);
+       agf->agf_cnt_root = cpu_to_be32(fab[XREP_AGF_CNTBT].root);
+       agf->agf_cnt_level = cpu_to_be32(fab[XREP_AGF_CNTBT].height);
 
-       agf->agf_roots[XFS_BTNUM_RMAPi] =
-                       cpu_to_be32(fab[XREP_AGF_RMAPBT].root);
-       agf->agf_levels[XFS_BTNUM_RMAPi] =
-                       cpu_to_be32(fab[XREP_AGF_RMAPBT].height);
+       agf->agf_rmap_root = cpu_to_be32(fab[XREP_AGF_RMAPBT].root);
+       agf->agf_rmap_level = cpu_to_be32(fab[XREP_AGF_RMAPBT].height);
 
        if (xfs_has_reflink(sc->mp)) {
                agf->agf_refcount_root =
@@ -333,12 +326,9 @@ xrep_agf_commit_new(
        pag->pagf_btreeblks = be32_to_cpu(agf->agf_btreeblks);
        pag->pagf_freeblks = be32_to_cpu(agf->agf_freeblks);
        pag->pagf_longest = be32_to_cpu(agf->agf_longest);
-       pag->pagf_levels[XFS_BTNUM_BNOi] =
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]);
-       pag->pagf_levels[XFS_BTNUM_CNTi] =
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]);
-       pag->pagf_levels[XFS_BTNUM_RMAPi] =
-                       be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAPi]);
+       pag->pagf_bno_level = be32_to_cpu(agf->agf_bno_level);
+       pag->pagf_cnt_level = be32_to_cpu(agf->agf_cnt_level);
+       pag->pagf_rmap_level = be32_to_cpu(agf->agf_rmap_level);
        pag->pagf_refcount_level = be32_to_cpu(agf->agf_refcount_level);
        set_bit(XFS_AGSTATE_AGF_INIT, &pag->pag_opstate);
 

diff --git a/fs/xfs/scrub/alloc_repair.c b/fs/xfs/scrub/alloc_repair.c
index 544c53d450ce2629c0b2b5e34f85cba9f61322fe..0ef27aacbf25cb8dd0f2642267b548a6e1dc2bd1 100644 (file)
--- a/fs/xfs/scrub/alloc_repair.c
+++ b/fs/xfs/scrub/alloc_repair.c
@@ -687,8 +687,8 @@ xrep_abt_reset_counters(
         * height values before re-initializing the perag info from the updated
         * AGF to capture all the new values.
         */
-       pag->pagf_repair_levels[XFS_BTNUM_BNOi] = pag->pagf_levels[XFS_BTNUM_BNOi];
-       pag->pagf_repair_levels[XFS_BTNUM_CNTi] = pag->pagf_levels[XFS_BTNUM_CNTi];
+       pag->pagf_repair_bno_level = pag->pagf_bno_level;
+       pag->pagf_repair_cnt_level = pag->pagf_cnt_level;
 
        /* Reinitialize with the values we just logged. */
        return xrep_reinit_pagf(sc);
@@ -768,10 +768,8 @@ xrep_abt_build_new_trees(
         * height so that we don't trip the verifiers when writing the new
         * btree blocks to disk.
         */
-       pag->pagf_repair_levels[XFS_BTNUM_BNOi] =
-                                       ra->new_bnobt.bload.btree_height;
-       pag->pagf_repair_levels[XFS_BTNUM_CNTi] =
-                                       ra->new_cntbt.bload.btree_height;
+       pag->pagf_repair_bno_level = ra->new_bnobt.bload.btree_height;
+       pag->pagf_repair_cnt_level = ra->new_cntbt.bload.btree_height;
 
        /* Load the free space by length tree. */
        ra->array_cur = XFARRAY_CURSOR_INIT;
@@ -810,8 +808,8 @@ xrep_abt_build_new_trees(
        return xrep_roll_ag_trans(sc);
 
 err_levels:
-       pag->pagf_repair_levels[XFS_BTNUM_BNOi] = 0;
-       pag->pagf_repair_levels[XFS_BTNUM_CNTi] = 0;
+       pag->pagf_repair_bno_level = 0;
+       pag->pagf_repair_cnt_level = 0;
 err_cur:
        xfs_btree_del_cursor(cnt_cur, error);
        xfs_btree_del_cursor(bno_cur, error);
@@ -841,8 +839,8 @@ xrep_abt_remove_old_trees(
         * Now that we've zapped all the old allocbt blocks we can turn off
         * the alternate height mechanism.
         */
-       pag->pagf_repair_levels[XFS_BTNUM_BNOi] = 0;
-       pag->pagf_repair_levels[XFS_BTNUM_CNTi] = 0;
+       pag->pagf_repair_bno_level = 0;
+       pag->pagf_repair_cnt_level = 0;
        return 0;
 }
 

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 9d0d7085b0794192cfb80d87453dd013577bee2d..e9c760fe7aa99ae1a026812eb5f8f49969bd01cb 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -1710,12 +1710,10 @@ DECLARE_EVENT_CLASS(xfs_agf_class,
                __entry->agno = be32_to_cpu(agf->agf_seqno),
                __entry->flags = flags;
                __entry->length = be32_to_cpu(agf->agf_length),
-               __entry->bno_root = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]),
-               __entry->cnt_root = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]),
-               __entry->bno_level =
-                               be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]),
-               __entry->cnt_level =
-                               be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]),
+               __entry->bno_root = be32_to_cpu(agf->agf_bno_root),
+               __entry->cnt_root = be32_to_cpu(agf->agf_cnt_root),
+               __entry->bno_level = be32_to_cpu(agf->agf_bno_level),
+               __entry->cnt_level = be32_to_cpu(agf->agf_cnt_level),
                __entry->flfirst = be32_to_cpu(agf->agf_flfirst),
                __entry->fllast = be32_to_cpu(agf->agf_fllast),
                __entry->flcount = be32_to_cpu(agf->agf_flcount),