xfs: convert refcount btree cursor to use perags

Source kernel commit: a81a06211fb43d80ee746e7a40a32ed812002f8e

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/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 0516ae6dbad84efd42cf60c98deacef40a86c88a..1338539474aba39b3884d48489c7ed43c9f58ea3 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -21,6 +21,7 @@
 #include "xfs_bit.h"
 #include "xfs_refcount.h"
 #include "xfs_rmap.h"
+#include "xfs_ag.h"
 
 /* Allowable refcount adjustment amounts. */
 enum xfs_refc_adjust_op {
@@ -1141,30 +1142,30 @@ xfs_refcount_finish_one(
        struct xfs_btree_cur            *rcur;
        struct xfs_buf                  *agbp = NULL;
        int                             error = 0;
-       xfs_agnumber_t                  agno;
        xfs_agblock_t                   bno;
        xfs_agblock_t                   new_agbno;
        unsigned long                   nr_ops = 0;
        int                             shape_changes = 0;
+       struct xfs_perag                *pag;
 
-       agno = XFS_FSB_TO_AGNO(mp, startblock);
-       ASSERT(agno != NULLAGNUMBER);
+       pag = xfs_perag_get(mp, XFS_FSB_TO_AGNO(mp, startblock));
        bno = XFS_FSB_TO_AGBNO(mp, startblock);
 
        trace_xfs_refcount_deferred(mp, XFS_FSB_TO_AGNO(mp, startblock),
                        type, XFS_FSB_TO_AGBNO(mp, startblock),
                        blockcount);
 
-       if (XFS_TEST_ERROR(false, mp,
-                       XFS_ERRTAG_REFCOUNT_FINISH_ONE))
-               return -EIO;
+       if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_REFCOUNT_FINISH_ONE)) {
+               error = -EIO;
+               goto out_drop;
+       }
 
        /*
         * If we haven't gotten a cursor or the cursor AG doesn't match
         * the startblock, get one now.
         */
        rcur = *pcur;
-       if (rcur != NULL && rcur->bc_ag.agno != agno) {
+       if (rcur != NULL && rcur->bc_ag.pag != pag) {
                nr_ops = rcur->bc_ag.refc.nr_ops;
                shape_changes = rcur->bc_ag.refc.shape_changes;
                xfs_refcount_finish_one_cleanup(tp, rcur, 0);
@@ -1172,12 +1173,12 @@ xfs_refcount_finish_one(
                *pcur = NULL;
        }
        if (rcur == NULL) {
-               error = xfs_alloc_read_agf(tp->t_mountp, tp, agno,
+               error = xfs_alloc_read_agf(tp->t_mountp, tp, pag->pag_agno,
                                XFS_ALLOC_FLAG_FREEING, &agbp);
                if (error)
-                       return error;
+                       goto out_drop;
 
-               rcur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno, NULL);
+               rcur = xfs_refcountbt_init_cursor(mp, tp, agbp, pag);
                rcur->bc_ag.refc.nr_ops = nr_ops;
                rcur->bc_ag.refc.shape_changes = shape_changes;
        }
@@ -1187,12 +1188,12 @@ xfs_refcount_finish_one(
        case XFS_REFCOUNT_INCREASE:
                error = xfs_refcount_adjust(rcur, bno, blockcount, &new_agbno,
                        new_len, XFS_REFCOUNT_ADJUST_INCREASE, NULL);
-               *new_fsb = XFS_AGB_TO_FSB(mp, agno, new_agbno);
+               *new_fsb = XFS_AGB_TO_FSB(mp, pag->pag_agno, new_agbno);
                break;
        case XFS_REFCOUNT_DECREASE:
                error = xfs_refcount_adjust(rcur, bno, blockcount, &new_agbno,
                        new_len, XFS_REFCOUNT_ADJUST_DECREASE, NULL);
-               *new_fsb = XFS_AGB_TO_FSB(mp, agno, new_agbno);
+               *new_fsb = XFS_AGB_TO_FSB(mp, pag->pag_agno, new_agbno);
                break;
        case XFS_REFCOUNT_ALLOC_COW:
                *new_fsb = startblock + blockcount;
@@ -1209,8 +1210,10 @@ xfs_refcount_finish_one(
                error = -EFSCORRUPTED;
        }
        if (!error && *new_len > 0)
-               trace_xfs_refcount_finish_one_leftover(mp, agno, type,
+               trace_xfs_refcount_finish_one_leftover(mp, pag->pag_agno, type,
                                bno, blockcount, new_agbno, *new_len);
+out_drop:
+       xfs_perag_put(pag);
        return error;
 }
 
@@ -1671,7 +1674,7 @@ xfs_refcount_recover_extent(
 int
 xfs_refcount_recover_cow_leftovers(
        struct xfs_mount                *mp,
-       xfs_agnumber_t                  agno)
+       struct xfs_perag                *pag)
 {
        struct xfs_trans                *tp;
        struct xfs_btree_cur            *cur;
@@ -1703,10 +1706,10 @@ xfs_refcount_recover_cow_leftovers(
        if (error)
                return error;
 
-       error = xfs_alloc_read_agf(mp, tp, agno, 0, &agbp);
+       error = xfs_alloc_read_agf(mp, tp, pag->pag_agno, 0, &agbp);
        if (error)
                goto out_trans;
-       cur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno, NULL);
+       cur = xfs_refcountbt_init_cursor(mp, tp, agbp, pag);
 
        /* Find all the leftover CoW staging extents. */
        memset(&low, 0, sizeof(low));
@@ -1728,11 +1731,12 @@ xfs_refcount_recover_cow_leftovers(
                if (error)
                        goto out_free;
 
-               trace_xfs_refcount_recover_extent(mp, agno, &rr->rr_rrec);
+               trace_xfs_refcount_recover_extent(mp, pag->pag_agno,
+                               &rr->rr_rrec);
 
                /* Free the orphan record */
                agbno = rr->rr_rrec.rc_startblock - XFS_REFC_COW_START;
-               fsb = XFS_AGB_TO_FSB(mp, agno, agbno);
+               fsb = XFS_AGB_TO_FSB(mp, pag->pag_agno, agbno);
                xfs_refcount_free_cow_extent(tp, fsb,
                                rr->rr_rrec.rc_blockcount);
 

diff --git a/libxfs/xfs_refcount.h b/libxfs/xfs_refcount.h
index 209795539c8dd012462e850fe721f5bca4888fea..9f6e9aae4da026d5d5ec528dba176a15005be255 100644 (file)
--- a/libxfs/xfs_refcount.h
+++ b/libxfs/xfs_refcount.h
@@ -6,6 +6,13 @@
 #ifndef __XFS_REFCOUNT_H__
 #define __XFS_REFCOUNT_H__
 
+struct xfs_trans;
+struct xfs_mount;
+struct xfs_perag;
+struct xfs_btree_cur;
+struct xfs_bmbt_irec;
+struct xfs_refcount_irec;
+
 extern int xfs_refcount_lookup_le(struct xfs_btree_cur *cur,
                xfs_agblock_t bno, int *stat);
 extern int xfs_refcount_lookup_ge(struct xfs_btree_cur *cur,
@@ -50,7 +57,7 @@ void xfs_refcount_alloc_cow_extent(struct xfs_trans *tp, xfs_fsblock_t fsb,
 void xfs_refcount_free_cow_extent(struct xfs_trans *tp, xfs_fsblock_t fsb,
                xfs_extlen_t len);
 extern int xfs_refcount_recover_cow_leftovers(struct xfs_mount *mp,
-               xfs_agnumber_t agno);
+               struct xfs_perag *pag);
 
 /*
  * While we're adjusting the refcounts records of an extent, we have

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index 0851d357e0090a1ad0705e46a845113a697f8fb5..1794b36d2b43ea6b4982e9eec125f2e7d7a82397 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -25,7 +25,7 @@ xfs_refcountbt_dup_cursor(
        struct xfs_btree_cur    *cur)
 {
        return xfs_refcountbt_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
@@ -315,13 +315,11 @@ static struct xfs_btree_cur *
 xfs_refcountbt_init_common(
        struct xfs_mount        *mp,
        struct xfs_trans        *tp,
-       xfs_agnumber_t          agno,
        struct xfs_perag        *pag)
 {
        struct xfs_btree_cur    *cur;
 
-       ASSERT(agno != NULLAGNUMBER);
-       ASSERT(agno < mp->m_sb.sb_agcount);
+       ASSERT(pag->pag_agno < mp->m_sb.sb_agcount);
 
        cur = kmem_cache_zalloc(xfs_btree_cur_zone, GFP_NOFS | __GFP_NOFAIL);
        cur->bc_tp = tp;
@@ -330,13 +328,12 @@ xfs_refcountbt_init_common(
        cur->bc_blocklog = mp->m_sb.sb_blocklog;
        cur->bc_statoff = XFS_STATS_CALC_INDEX(xs_refcbt_2);
 
-       cur->bc_ag.agno = agno;
        cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;
-       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;
 
        cur->bc_ag.refc.nr_ops = 0;
        cur->bc_ag.refc.shape_changes = 0;
@@ -350,13 +347,12 @@ xfs_refcountbt_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_refcountbt_init_common(mp, tp, agno, pag);
+       cur = xfs_refcountbt_init_common(mp, tp, pag);
        cur->bc_nlevels = be32_to_cpu(agf->agf_refcount_level);
        cur->bc_ag.agbp = agbp;
        return cur;
@@ -367,11 +363,11 @@ struct xfs_btree_cur *
 xfs_refcountbt_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_refcountbt_init_common(mp, NULL, agno, NULL);
+       cur = xfs_refcountbt_init_common(mp, NULL, pag);
        xfs_btree_stage_afakeroot(cur, afake);
        return cur;
 }

diff --git a/libxfs/xfs_refcount_btree.h b/libxfs/xfs_refcount_btree.h
index 8b82a39f104aa5104e983522f8246512798c72e8..bd9ed9e1e41ff46c11ae61b65a13eba4263b62c9 100644 (file)
--- a/libxfs/xfs_refcount_btree.h
+++ b/libxfs/xfs_refcount_btree.h
@@ -47,9 +47,9 @@ struct xbtree_afakeroot;
 
 extern struct xfs_btree_cur *xfs_refcountbt_init_cursor(struct xfs_mount *mp,
                struct xfs_trans *tp, struct xfs_buf *agbp,
-               xfs_agnumber_t agno, struct xfs_perag *pag);
+               struct xfs_perag *pag);
 struct xfs_btree_cur *xfs_refcountbt_stage_cursor(struct xfs_mount *mp,
-               struct xbtree_afakeroot *afake, xfs_agnumber_t agno);
+               struct xbtree_afakeroot *afake, struct xfs_perag *pag);
 extern int xfs_refcountbt_maxrecs(int blocklen, bool leaf);
 extern void xfs_refcountbt_compute_maxlevels(struct xfs_mount *mp);
 

diff --git a/repair/agbtree.c b/repair/agbtree.c
index d1b35b69409d4ce35490d2682f7c56d7a8a6b404..b2dbbffd8bf6c340df298396d680c95d43b6388a 100644 (file)
--- a/repair/agbtree.c
+++ b/repair/agbtree.c
@@ -645,10 +645,11 @@ get_refcountbt_record(
 void
 init_refc_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_hasreflink(&sc->mp->m_sb))
@@ -656,7 +657,7 @@ init_refc_cursor(
 
        init_rebuild(sc, &XFS_RMAP_OINFO_REFC, free_space, btr);
        btr->cur = libxfs_refcountbt_stage_cursor(sc->mp, &btr->newbt.afake,
-                       agno);
+                       pag);
 
        btr->bload.get_record = get_refcountbt_record;
        btr->bload.claim_block = rebuild_claim_block;

diff --git a/repair/agbtree.h b/repair/agbtree.h
index 88b077389d48622ef93f1f8c5f25cca925db6a2c..a44d5e84673d079fd4b1a2367884c8ee08e22b14 100644 (file)
--- a/repair/agbtree.h
+++ b/repair/agbtree.h
@@ -54,7 +54,7 @@ void init_rmapbt_cursor(struct repair_ctx *sc, struct xfs_perag *pag,
 void build_rmap_tree(struct repair_ctx *sc, xfs_agnumber_t agno,
                struct bt_rebuild *btr);
 
-void init_refc_cursor(struct repair_ctx *sc, xfs_agnumber_t agno,
+void init_refc_cursor(struct repair_ctx *sc, struct xfs_perag *pag,
                unsigned int free_space, struct bt_rebuild *btr);
 void build_refcount_tree(struct repair_ctx *sc, xfs_agnumber_t agno,
                struct bt_rebuild *btr);

diff --git a/repair/phase5.c b/repair/phase5.c
index 0cdcf71095e1ce6e38fb373cd7a8363fc7e153a1..04d45e3d61f08c85e55677ff018c0cb45d0c3a85 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -479,7 +479,7 @@ _("unable to rebuild AG %u.  Not enough free space in on-disk AG.\n"),
 
        init_rmapbt_cursor(&sc, pag, num_freeblocks, &btr_rmap);
 
-       init_refc_cursor(&sc, agno, num_freeblocks, &btr_refc);
+       init_refc_cursor(&sc, pag, num_freeblocks, &btr_refc);
 
        num_extents = count_bno_extents_blocks(agno, &num_freeblocks);
        /*

diff --git a/repair/rmap.c b/repair/rmap.c
index 5670c6a0476e500648d4da3aa3797b4a96ec018d..12fe7442b6fdff0335494ee731602e1bfd31202b 100644 (file)
--- a/repair/rmap.c
+++ b/repair/rmap.c
@@ -1371,7 +1371,7 @@ check_refcounts(
        pag = libxfs_perag_get(mp, agno);
        pag->pagf_init = 0;
 
-       bt_cur = libxfs_refcountbt_init_cursor(mp, NULL, agbp, agno, pag);
+       bt_cur = libxfs_refcountbt_init_cursor(mp, NULL, agbp, pag);
        if (!bt_cur) {
                error = -ENOMEM;
                goto err;