xfs: clean up rmap log intent item tracepoint callsites

Pass the incore rmap structure to the tracepoints instead of open-coding
the argument passing.

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

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index 46bee57cc140f7424d55ded4a84d0348eda71c6e..57c0d9418e5930c50b641fb968bf4003c1131928 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -2584,20 +2584,15 @@ xfs_rmap_finish_one(
        struct xfs_rmap_intent          *ri,
        struct xfs_btree_cur            **pcur)
 {
+       struct xfs_owner_info           oinfo;
        struct xfs_mount                *mp = tp->t_mountp;
        struct xfs_btree_cur            *rcur;
        struct xfs_buf                  *agbp = NULL;
-       int                             error = 0;
-       struct xfs_owner_info           oinfo;
        xfs_agblock_t                   bno;
        bool                            unwritten;
+       int                             error = 0;
 
-       bno = XFS_FSB_TO_AGBNO(mp, ri->ri_bmap.br_startblock);
-
-       trace_xfs_rmap_deferred(mp, ri->ri_pag->pag_agno, ri->ri_type, bno,
-                       ri->ri_owner, ri->ri_whichfork,
-                       ri->ri_bmap.br_startoff, ri->ri_bmap.br_blockcount,
-                       ri->ri_bmap.br_state);
+       trace_xfs_rmap_deferred(mp, ri);
 
        if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_RMAP_FINISH_ONE))
                return -EIO;
@@ -2672,15 +2667,6 @@ __xfs_rmap_add(
 {
        struct xfs_rmap_intent          *ri;
 
-       trace_xfs_rmap_defer(tp->t_mountp,
-                       XFS_FSB_TO_AGNO(tp->t_mountp, bmap->br_startblock),
-                       type,
-                       XFS_FSB_TO_AGBNO(tp->t_mountp, bmap->br_startblock),
-                       owner, whichfork,
-                       bmap->br_startoff,
-                       bmap->br_blockcount,
-                       bmap->br_state);
-
        ri = kmem_cache_alloc(xfs_rmap_intent_cache, GFP_KERNEL | __GFP_NOFAIL);
        INIT_LIST_HEAD(&ri->ri_list);
        ri->ri_type = type;
@@ -2688,6 +2674,8 @@ __xfs_rmap_add(
        ri->ri_whichfork = whichfork;
        ri->ri_bmap = *bmap;
 
+       trace_xfs_rmap_defer(tp->t_mountp, ri);
+
        xfs_rmap_update_get_group(tp->t_mountp, ri);
        xfs_defer_add(tp, &ri->ri_list, &xfs_rmap_update_defer_type);
 }

diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h
index 9d01fe689497bd9a219aef87d088176e2f39f368..731c97137b5a06fd4a6fc48d85dbffd23a8ed693 100644 (file)
--- a/libxfs/xfs_rmap.h
+++ b/libxfs/xfs_rmap.h
@@ -157,6 +157,16 @@ enum xfs_rmap_intent_type {
        XFS_RMAP_FREE,
 };
 
+#define XFS_RMAP_INTENT_STRINGS \
+       { XFS_RMAP_MAP,                 "map" }, \
+       { XFS_RMAP_MAP_SHARED,          "map_shared" }, \
+       { XFS_RMAP_UNMAP,               "unmap" }, \
+       { XFS_RMAP_UNMAP_SHARED,        "unmap_shared" }, \
+       { XFS_RMAP_CONVERT,             "cvt" }, \
+       { XFS_RMAP_CONVERT_SHARED,      "cvt_shared" }, \
+       { XFS_RMAP_ALLOC,               "alloc" }, \
+       { XFS_RMAP_FREE,                "free" }
+
 struct xfs_rmap_intent {
        struct list_head                        ri_list;
        enum xfs_rmap_intent_type               ri_type;