xfs: prepare refcount btree tracepoints for widening

Prepare the rest of refcount btree tracepoints for use with realtime
reflink by making them take the btree cursor object as a parameter.
This will save us a lot of trouble later on.

Remove the xfs_refcount_recover_extent tracepoint since it's already
covered by other refcount tracepoints.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 4143aca5f7c94a457579dc77e0ceb79ce90bb6c9..31b6549f5f3abda60b64c68a2af319a28c5dea03 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -182,7 +182,7 @@ xfs_refcount_get_rec(
        if (fa)
                return xfs_refcount_complain_bad_rec(cur, fa, irec);
 
-       trace_xfs_refcount_get(cur->bc_mp, cur->bc_ag.pag->pag_agno, irec);
+       trace_xfs_refcount_get(cur, irec);
        return 0;
 }
 
@@ -200,7 +200,7 @@ xfs_refcount_update(
        uint32_t                start;
        int                     error;
 
-       trace_xfs_refcount_update(cur->bc_mp, cur->bc_ag.pag->pag_agno, irec);
+       trace_xfs_refcount_update(cur, irec);
 
        start = xfs_refcount_encode_startblock(irec->rc_startblock,
                        irec->rc_domain);
@@ -227,7 +227,7 @@ xfs_refcount_insert(
 {
        int                             error;
 
-       trace_xfs_refcount_insert(cur->bc_mp, cur->bc_ag.pag->pag_agno, irec);
+       trace_xfs_refcount_insert(cur, irec);
 
        cur->bc_rec.rc.rc_startblock = irec->rc_startblock;
        cur->bc_rec.rc.rc_blockcount = irec->rc_blockcount;
@@ -272,7 +272,7 @@ xfs_refcount_delete(
                error = -EFSCORRUPTED;
                goto out_error;
        }
-       trace_xfs_refcount_delete(cur->bc_mp, cur->bc_ag.pag->pag_agno, &irec);
+       trace_xfs_refcount_delete(cur, &irec);
        error = xfs_btree_delete(cur, i);
        if (XFS_IS_CORRUPT(cur->bc_mp, *i != 1)) {
                xfs_btree_mark_sick(cur);
@@ -409,8 +409,7 @@ xfs_refcount_split_extent(
                return 0;
 
        *shape_changed = true;
-       trace_xfs_refcount_split_extent(cur->bc_mp, cur->bc_ag.pag->pag_agno,
-                       &rcext, agbno);
+       trace_xfs_refcount_split_extent(cur, &rcext, agbno);
 
        /* Establish the right extent. */
        tmp = rcext;
@@ -453,8 +452,7 @@ xfs_refcount_merge_center_extents(
        int                             error;
        int                             found_rec;
 
-       trace_xfs_refcount_merge_center_extents(cur->bc_mp,
-                       cur->bc_ag.pag->pag_agno, left, center, right);
+       trace_xfs_refcount_merge_center_extents(cur, left, center, right);
 
        ASSERT(left->rc_domain == center->rc_domain);
        ASSERT(right->rc_domain == center->rc_domain);
@@ -535,8 +533,7 @@ xfs_refcount_merge_left_extent(
        int                             error;
        int                             found_rec;
 
-       trace_xfs_refcount_merge_left_extent(cur->bc_mp,
-                       cur->bc_ag.pag->pag_agno, left, cleft);
+       trace_xfs_refcount_merge_left_extent(cur, left, cleft);
 
        ASSERT(left->rc_domain == cleft->rc_domain);
 
@@ -600,8 +597,7 @@ xfs_refcount_merge_right_extent(
        int                             error;
        int                             found_rec;
 
-       trace_xfs_refcount_merge_right_extent(cur->bc_mp,
-                       cur->bc_ag.pag->pag_agno, cright, right);
+       trace_xfs_refcount_merge_right_extent(cur, cright, right);
 
        ASSERT(right->rc_domain == cright->rc_domain);
 
@@ -740,8 +736,7 @@ not_found:
                cleft->rc_refcount = 1;
                cleft->rc_domain = domain;
        }
-       trace_xfs_refcount_find_left_extent(cur->bc_mp, cur->bc_ag.pag->pag_agno,
-                       left, cleft, agbno);
+       trace_xfs_refcount_find_left_extent(cur, left, cleft, agbno);
        return error;
 
 out_error:
@@ -834,8 +829,8 @@ not_found:
                cright->rc_refcount = 1;
                cright->rc_domain = domain;
        }
-       trace_xfs_refcount_find_right_extent(cur->bc_mp, cur->bc_ag.pag->pag_agno,
-                       cright, right, agbno + aglen);
+       trace_xfs_refcount_find_right_extent(cur, cright, right,
+                       agbno + aglen);
        return error;
 
 out_error:
@@ -1138,8 +1133,7 @@ xfs_refcount_adjust_extents(
                        tmp.rc_refcount = 1 + adj;
                        tmp.rc_domain = XFS_REFC_DOMAIN_SHARED;
 
-                       trace_xfs_refcount_modify_extent(cur->bc_mp,
-                                       cur->bc_ag.pag->pag_agno, &tmp);
+                       trace_xfs_refcount_modify_extent(cur, &tmp);
 
                        /*
                         * Either cover the hole (increment) or
@@ -1204,8 +1198,7 @@ xfs_refcount_adjust_extents(
                if (ext.rc_refcount == MAXREFCOUNT)
                        goto skip;
                ext.rc_refcount += adj;
-               trace_xfs_refcount_modify_extent(cur->bc_mp,
-                               cur->bc_ag.pag->pag_agno, &ext);
+               trace_xfs_refcount_modify_extent(cur, &ext);
                cur->bc_refc.nr_ops++;
                if (ext.rc_refcount > 1) {
                        error = xfs_refcount_update(cur, &ext);
@@ -1720,8 +1713,7 @@ xfs_refcount_adjust_cow_extents(
                tmp.rc_refcount = 1;
                tmp.rc_domain = XFS_REFC_DOMAIN_COW;
 
-               trace_xfs_refcount_modify_extent(cur->bc_mp,
-                               cur->bc_ag.pag->pag_agno, &tmp);
+               trace_xfs_refcount_modify_extent(cur, &tmp);
 
                error = xfs_refcount_insert(cur, &tmp,
                                &found_tmp);
@@ -1752,8 +1744,7 @@ xfs_refcount_adjust_cow_extents(
                }
 
                ext.rc_refcount = 0;
-               trace_xfs_refcount_modify_extent(cur->bc_mp,
-                               cur->bc_ag.pag->pag_agno, &ext);
+               trace_xfs_refcount_modify_extent(cur, &ext);
                error = xfs_refcount_delete(cur, &found_rec);
                if (error)
                        goto out_error;
@@ -1989,9 +1980,6 @@ xfs_refcount_recover_cow_leftovers(
                if (error)
                        goto out_free;
 
-               trace_xfs_refcount_recover_extent(mp, pag->pag_agno,
-                               &rr->rr_rrec);
-
                /* Free the orphan record */
                fsb = XFS_AGB_TO_FSB(mp, pag->pag_agno,
                                rr->rr_rrec.rc_startblock);