xfs: convert rmap btree cursor to using a perag

Source kernel commit: fa9c3c197329fdab0efc48a8944d2c4a21c6a74f

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

diff --git a/db/fsmap.c b/db/fsmap.c
index 5973f0d611df77decc66175e44511dc63b55c29f..65e9f1ba1195bfa2c79712b44c12eb9b12291c92 100644 (file)
--- a/db/fsmap.c
+++ b/db/fsmap.c
@@ -74,8 +74,7 @@ fsmap(
                        return;
                }
 
-               bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp,
-                               pag->pag_agno, pag);
+               bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, pag);
                if (!bt_cur) {
                        libxfs_buf_relse(agbp);
                        libxfs_perag_put(pag);

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 1027bc7bd7bd5ee35271fcb82187ac2e8072f2f7..1db6a65b77e84c8ff7eddd32d5af009bb259756e 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -913,7 +913,7 @@ xfs_ag_extend_space(
         * XFS_RMAP_OINFO_SKIP_UPDATE is used here to tell the rmap btree that
         * this doesn't actually exist in the rmap btree.
         */
-       error = xfs_rmap_free(tp, bp, id->agno,
+       error = xfs_rmap_free(tp, bp, bp->b_pag,
                                be32_to_cpu(agf->agf_length) - len,
                                len, &XFS_RMAP_OINFO_SKIP_UPDATE);
        if (error)

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index dfe0a9ce3f4a3c9ee7ede1362247e0ccc822331d..199c7faeeeb4df1f2fe63f5ed9014ec0baf15672 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -1088,7 +1088,7 @@ xfs_alloc_ag_vextent_small(
         * If we're feeding an AGFL block to something that doesn't live in the
         * free space, we need to clear out the OWN_AG rmap.
         */
-       error = xfs_rmap_free(args->tp, args->agbp, args->agno, fbno, 1,
+       error = xfs_rmap_free(args->tp, args->agbp, args->pag, fbno, 1,
                              &XFS_RMAP_OINFO_AG);
        if (error)
                goto error;
@@ -1165,7 +1165,7 @@ xfs_alloc_ag_vextent(
 
        /* if not file data, insert new block into the reverse map btree */
        if (!xfs_rmap_should_skip_owner_update(&args->oinfo)) {
-               error = xfs_rmap_alloc(args->tp, args->agbp, args->agno,
+               error = xfs_rmap_alloc(args->tp, args->agbp, args->pag,
                                       args->agbno, args->len, &args->oinfo);
                if (error)
                        return error;
@@ -1895,12 +1895,13 @@ xfs_free_ag_extent(
        int                             haveright; /* have a right neighbor */
        int                             i;
        int                             error;
+       struct xfs_perag                *pag = agbp->b_pag;
 
        bno_cur = cnt_cur = NULL;
        mp = tp->t_mountp;
 
        if (!xfs_rmap_should_skip_owner_update(oinfo)) {
-               error = xfs_rmap_free(tp, agbp, agno, bno, len, oinfo);
+               error = xfs_rmap_free(tp, agbp, pag, bno, len, oinfo);
                if (error)
                        goto error0;
        }

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index e61de3b2ad803441d8c97ef83f841e802b71af97..f0621ca5c061f71242438c7c43cf7dc10adccbc6 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -695,7 +695,7 @@ int
 xfs_rmap_free(
        struct xfs_trans                *tp,
        struct xfs_buf                  *agbp,
-       xfs_agnumber_t                  agno,
+       struct xfs_perag                *pag,
        xfs_agblock_t                   bno,
        xfs_extlen_t                    len,
        const struct xfs_owner_info     *oinfo)
@@ -707,7 +707,7 @@ xfs_rmap_free(
        if (!xfs_sb_version_hasrmapbt(&mp->m_sb))
                return 0;
 
-       cur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno, NULL);
+       cur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag);
 
        error = xfs_rmap_unmap(cur, bno, len, false, oinfo);
 
@@ -949,7 +949,7 @@ int
 xfs_rmap_alloc(
        struct xfs_trans                *tp,
        struct xfs_buf                  *agbp,
-       xfs_agnumber_t                  agno,
+       struct xfs_perag                *pag,
        xfs_agblock_t                   bno,
        xfs_extlen_t                    len,
        const struct xfs_owner_info     *oinfo)
@@ -961,7 +961,7 @@ xfs_rmap_alloc(
        if (!xfs_sb_version_hasrmapbt(&mp->m_sb))
                return 0;
 
-       cur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno, NULL);
+       cur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag);
        error = xfs_rmap_map(cur, bno, len, false, oinfo);
 
        xfs_btree_del_cursor(cur, error);
@@ -2407,7 +2407,7 @@ xfs_rmap_finish_one(
                        goto out_drop;
                }
 
-               rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag->pag_agno, pag);
+               rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, pag);
        }
        *pcur = rcur;
 

diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h
index abe633403fd152db0eecb4d31e25caaa5c5dd020..f2423cf7f1e28d63d920b50d33f2722a3643e815 100644 (file)
--- a/libxfs/xfs_rmap.h
+++ b/libxfs/xfs_rmap.h
@@ -6,6 +6,8 @@
 #ifndef __XFS_RMAP_H__
 #define __XFS_RMAP_H__
 
+struct xfs_perag;
+
 static inline void
 xfs_rmap_ino_bmbt_owner(
        struct xfs_owner_info   *oi,
@@ -113,10 +115,10 @@ xfs_owner_info_pack(
 }
 
 int xfs_rmap_alloc(struct xfs_trans *tp, struct xfs_buf *agbp,
-                  xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len,
+                  struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len,
                   const struct xfs_owner_info *oinfo);
 int xfs_rmap_free(struct xfs_trans *tp, struct xfs_buf *agbp,
-                 xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len,
+                 struct xfs_perag *pag, xfs_agblock_t bno, xfs_extlen_t len,
                  const struct xfs_owner_info *oinfo);
 
 int xfs_rmap_lookup_le(struct xfs_btree_cur *cur, xfs_agblock_t bno,

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index bed2f38159b700f99c1152f6abf7531ec164e88f..7f71d3550f2cf9bd4ff4b33e9fb9911be914683c 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -50,7 +50,7 @@ xfs_rmapbt_dup_cursor(
        struct xfs_btree_cur    *cur)
 {
        return xfs_rmapbt_init_cursor(cur->bc_mp, cur->bc_tp,
-                       cur->bc_ag.agbp, cur->bc_ag.agno, cur->bc_ag.pag);
+                               cur->bc_ag.agbp, cur->bc_ag.pag);
 }
 
 STATIC void
@@ -62,13 +62,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;
-       struct xfs_perag        *pag = agbp->b_pag;
 
        ASSERT(ptr->s != 0);
 
        agf->agf_roots[btnum] = ptr->s;
        be32_add_cpu(&agf->agf_levels[btnum], inc);
-       pag->pagf_levels[btnum] += inc;
+       cur->bc_ag.pag->pagf_levels[btnum] += inc;
 
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS);
 }
@@ -82,6 +81,7 @@ xfs_rmapbt_alloc_block(
 {
        struct xfs_buf          *agbp = cur->bc_ag.agbp;
        struct xfs_agf          *agf = agbp->b_addr;
+       struct xfs_perag        *pag = cur->bc_ag.pag;
        int                     error;
        xfs_agblock_t           bno;
 
@@ -91,20 +91,19 @@ xfs_rmapbt_alloc_block(
        if (error)
                return error;
 
-       trace_xfs_rmapbt_alloc_block(cur->bc_mp, cur->bc_ag.agno,
-                       bno, 1);
+       trace_xfs_rmapbt_alloc_block(cur->bc_mp, pag->pag_agno, bno, 1);
        if (bno == NULLAGBLOCK) {
                *stat = 0;
                return 0;
        }
 
-       xfs_extent_busy_reuse(cur->bc_mp, agbp->b_pag, bno, 1, false);
+       xfs_extent_busy_reuse(cur->bc_mp, pag, bno, 1, false);
 
        new->s = cpu_to_be32(bno);
        be32_add_cpu(&agf->agf_rmap_blocks, 1);
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);
 
-       xfs_ag_resv_rmapbt_alloc(cur->bc_mp, cur->bc_ag.agno);
+       xfs_ag_resv_rmapbt_alloc(cur->bc_mp, pag->pag_agno);
 
        *stat = 1;
        return 0;
@@ -117,12 +116,12 @@ xfs_rmapbt_free_block(
 {
        struct xfs_buf          *agbp = cur->bc_ag.agbp;
        struct xfs_agf          *agf = agbp->b_addr;
-       struct xfs_perag        *pag;
+       struct xfs_perag        *pag = cur->bc_ag.pag;
        xfs_agblock_t           bno;
        int                     error;
 
        bno = xfs_daddr_to_agbno(cur->bc_mp, XFS_BUF_ADDR(bp));
-       trace_xfs_rmapbt_free_block(cur->bc_mp, cur->bc_ag.agno,
+       trace_xfs_rmapbt_free_block(cur->bc_mp, pag->pag_agno,
                        bno, 1);
        be32_add_cpu(&agf->agf_rmap_blocks, -1);
        xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_RMAP_BLOCKS);
@@ -130,7 +129,6 @@ xfs_rmapbt_free_block(
        if (error)
                return error;
 
-       pag = cur->bc_ag.agbp->b_pag;
        xfs_extent_busy_insert(cur->bc_tp, pag, bno, 1,
                              XFS_EXTENT_BUSY_SKIP_DISCARD);
 
@@ -212,7 +210,7 @@ xfs_rmapbt_init_ptr_from_cur(
 {
        struct xfs_agf          *agf = cur->bc_ag.agbp->b_addr;
 
-       ASSERT(cur->bc_ag.agno == be32_to_cpu(agf->agf_seqno));
+       ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno));
 
        ptr->s = agf->agf_roots[cur->bc_btnum];
 }
@@ -447,7 +445,6 @@ static struct xfs_btree_cur *
 xfs_rmapbt_init_common(
        struct xfs_mount        *mp,
        struct xfs_trans        *tp,
-       xfs_agnumber_t          agno,
        struct xfs_perag        *pag)
 {
        struct xfs_btree_cur    *cur;
@@ -460,13 +457,12 @@ xfs_rmapbt_init_common(
        cur->bc_flags = XFS_BTREE_CRC_BLOCKS | XFS_BTREE_OVERLAPPING;
        cur->bc_blocklog = mp->m_sb.sb_blocklog;
        cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_rmap_2);
-       cur->bc_ag.agno = agno;
        cur->bc_ops = &xfs_rmapbt_ops;
-       if (pag) {
-               /* take a reference for the cursor */
-               atomic_inc(&pag->pag_ref);
-       }
+
+       /* take a reference for the cursor */
+       atomic_inc(&pag->pag_ref);
        cur->bc_ag.pag = pag;
+       cur->bc_ag.agno = pag->pag_agno;
 
        return cur;
 }
@@ -477,13 +473,12 @@ xfs_rmapbt_init_cursor(
        struct xfs_mount        *mp,
        struct xfs_trans        *tp,
        struct xfs_buf          *agbp,
-       xfs_agnumber_t          agno,
        struct xfs_perag        *pag)
 {
        struct xfs_agf          *agf = agbp->b_addr;
        struct xfs_btree_cur    *cur;
 
-       cur = xfs_rmapbt_init_common(mp, tp, agno, pag);
+       cur = xfs_rmapbt_init_common(mp, tp, pag);
        cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]);
        cur->bc_ag.agbp = agbp;
        return cur;
@@ -494,11 +489,11 @@ struct xfs_btree_cur *
 xfs_rmapbt_stage_cursor(
        struct xfs_mount        *mp,
        struct xbtree_afakeroot *afake,
-       xfs_agnumber_t          agno)
+       struct xfs_perag        *pag)
 {
        struct xfs_btree_cur    *cur;
 
-       cur = xfs_rmapbt_init_common(mp, NULL, agno, NULL);
+       cur = xfs_rmapbt_init_common(mp, NULL, pag);
        xfs_btree_stage_afakeroot(cur, afake);
        return cur;
 }

diff --git a/libxfs/xfs_rmap_btree.h b/libxfs/xfs_rmap_btree.h
index b036470a5446f0e79d3439c6d40e0bd6ba66f500..f2eee6572af4a40ee3fd49a23036432f9fff18fd 100644 (file)
--- a/libxfs/xfs_rmap_btree.h
+++ b/libxfs/xfs_rmap_btree.h
@@ -43,9 +43,9 @@ struct xbtree_afakeroot;
 
 struct xfs_btree_cur *xfs_rmapbt_init_cursor(struct xfs_mount *mp,
                                struct xfs_trans *tp, struct xfs_buf *bp,
-                               xfs_agnumber_t agno, struct xfs_perag *pag);
+                               struct xfs_perag *pag);
 struct xfs_btree_cur *xfs_rmapbt_stage_cursor(struct xfs_mount *mp,
-               struct xbtree_afakeroot *afake, xfs_agnumber_t agno);
+               struct xbtree_afakeroot *afake, struct xfs_perag *pag);
 void xfs_rmapbt_commit_staged_btree(struct xfs_btree_cur *cur,
                struct xfs_trans *tp, struct xfs_buf *agbp);
 int xfs_rmapbt_maxrecs(int blocklen, int leaf);

diff --git a/repair/agbtree.c b/repair/agbtree.c
index cc066f2ec74838789b6d432cc7a29a25a5056644..d1b35b69409d4ce35490d2682f7c56d7a8a6b404 100644 (file)
--- a/repair/agbtree.c
+++ b/repair/agbtree.c
@@ -574,17 +574,18 @@ get_rmapbt_record(
 void
 init_rmapbt_cursor(
        struct repair_ctx       *sc,
-       xfs_agnumber_t          agno,
+       struct xfs_perag        *pag,
        unsigned int            free_space,
        struct bt_rebuild       *btr)
 {
+       xfs_agnumber_t          agno = pag->pag_agno;
        int                     error;
 
        if (!xfs_sb_version_hasrmapbt(&sc->mp->m_sb))
                return;
 
        init_rebuild(sc, &XFS_RMAP_OINFO_AG, free_space, btr);
-       btr->cur = libxfs_rmapbt_stage_cursor(sc->mp, &btr->newbt.afake, agno);
+       btr->cur = libxfs_rmapbt_stage_cursor(sc->mp, &btr->newbt.afake, pag);
 
        btr->bload.get_record = get_rmapbt_record;
        btr->bload.claim_block = rebuild_claim_block;

diff --git a/repair/agbtree.h b/repair/agbtree.h
index d8095d20714f086ead4408ec4ec30166d6b6c900..88b077389d48622ef93f1f8c5f25cca925db6a2c 100644 (file)
--- a/repair/agbtree.h
+++ b/repair/agbtree.h
@@ -49,7 +49,7 @@ void init_ino_cursors(struct repair_ctx *sc, xfs_agnumber_t agno,
 void build_inode_btrees(struct repair_ctx *sc, xfs_agnumber_t agno,
                struct bt_rebuild *btr_ino, struct bt_rebuild *btr_fino);
 
-void init_rmapbt_cursor(struct repair_ctx *sc, xfs_agnumber_t agno,
+void init_rmapbt_cursor(struct repair_ctx *sc, struct xfs_perag *pag,
                unsigned int free_space, struct bt_rebuild *btr);
 void build_rmap_tree(struct repair_ctx *sc, xfs_agnumber_t agno,
                struct bt_rebuild *btr);

diff --git a/repair/phase5.c b/repair/phase5.c
index fcdf757ccd12640dcfeba0f5004d217a072a8bd5..0cdcf71095e1ce6e38fb373cd7a8363fc7e153a1 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -433,7 +433,7 @@ keep_fsinos(xfs_mount_t *mp)
 static void
 phase5_func(
        struct xfs_mount        *mp,
-       xfs_agnumber_t          agno,
+       struct xfs_perag        *pag,
        struct bitmap           *lost_blocks)
 {
        struct repair_ctx       sc = { .mp = mp, };
@@ -443,6 +443,7 @@ phase5_func(
        struct bt_rebuild       btr_fino;
        struct bt_rebuild       btr_rmap;
        struct bt_rebuild       btr_refc;
+       xfs_agnumber_t          agno = pag->pag_agno;
        int                     extra_blocks = 0;
        uint                    num_freeblocks;
        xfs_agblock_t           num_extents;
@@ -476,7 +477,7 @@ _("unable to rebuild AG %u.  Not enough free space in on-disk AG.\n"),
        init_ino_cursors(&sc, agno, num_freeblocks, &sb_icount_ag[agno],
                        &sb_ifree_ag[agno], &btr_ino, &btr_fino);
 
-       init_rmapbt_cursor(&sc, agno, num_freeblocks, &btr_rmap);
+       init_rmapbt_cursor(&sc, pag, num_freeblocks, &btr_rmap);
 
        init_refc_cursor(&sc, agno, num_freeblocks, &btr_refc);
 
@@ -605,6 +606,7 @@ void
 phase5(xfs_mount_t *mp)
 {
        struct bitmap           *lost_blocks = NULL;
+       struct xfs_perag        *pag;
        xfs_agnumber_t          agno;
        int                     error;
 
@@ -651,8 +653,8 @@ phase5(xfs_mount_t *mp)
        if (error)
                do_error(_("cannot alloc lost block bitmap\n"));
 
-       for (agno = 0; agno < mp->m_sb.sb_agcount; agno++)
-               phase5_func(mp, agno, lost_blocks);
+       for_each_perag(mp, agno, pag)
+               phase5_func(mp, pag, lost_blocks);
 
        print_final_rpt();
 

diff --git a/repair/rmap.c b/repair/rmap.c
index 2ffa27c8b09dfc6a9d93c72ce8e3cc0e039c8718..5670c6a0476e500648d4da3aa3797b4a96ec018d 100644 (file)
--- a/repair/rmap.c
+++ b/repair/rmap.c
@@ -545,6 +545,7 @@ rmap_store_ag_btree_rec(
        rm_rec = pop_slab_cursor(rm_cur);
        while (rm_rec) {
                struct xfs_owner_info   oinfo = {};
+               struct xfs_perag        *pag;
 
                error = -libxfs_trans_alloc_rollable(mp, 16, &tp);
                if (error)
@@ -556,8 +557,10 @@ rmap_store_ag_btree_rec(
 
                ASSERT(XFS_RMAP_NON_INODE_OWNER(rm_rec->rm_owner));
                oinfo.oi_owner = rm_rec->rm_owner;
-               error = -libxfs_rmap_alloc(tp, agbp, agno, rm_rec->rm_startblock,
+               pag = libxfs_perag_get(mp, agno);
+               error = -libxfs_rmap_alloc(tp, agbp, pag, rm_rec->rm_startblock,
                                rm_rec->rm_blockcount, &oinfo);
+               libxfs_perag_put(pag);
                if (error)
                        goto err_trans;
 
@@ -1006,7 +1009,7 @@ rmaps_verify_btree(
        pag = libxfs_perag_get(mp, agno);
        pag->pagf_init = 0;
 
-       bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, agno, pag);
+       bt_cur = libxfs_rmapbt_init_cursor(mp, NULL, agbp, pag);
        if (!bt_cur) {
                error = -ENOMEM;
                goto err;