xfs: clean up bmap log intent item tracepoint callsites

Source kernel commit: 2a15e7686094d1362b5026533b96f57ec989a245

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

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

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index a82a41249fd3b6ddc7804cef32944d3f680a62e6..ae4f7e699922b3ee7f2a019b2c53bf69f75339aa 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -6185,15 +6185,6 @@ __xfs_bmap_add(
 {
        struct xfs_bmap_intent          *bi;
 
-       trace_xfs_bmap_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),
-                       ip->i_ino, whichfork,
-                       bmap->br_startoff,
-                       bmap->br_blockcount,
-                       bmap->br_state);
-
        bi = kmem_cache_alloc(xfs_bmap_intent_cache, GFP_KERNEL | __GFP_NOFAIL);
        INIT_LIST_HEAD(&bi->bi_list);
        bi->bi_type = type;
@@ -6201,6 +6192,8 @@ __xfs_bmap_add(
        bi->bi_whichfork = whichfork;
        bi->bi_bmap = *bmap;
 
+       trace_xfs_bmap_defer(bi);
+
        xfs_bmap_update_get_group(tp->t_mountp, bi);
        xfs_defer_add(tp, &bi->bi_list, &xfs_bmap_update_defer_type);
        return 0;
@@ -6246,13 +6239,7 @@ xfs_bmap_finish_one(
 
        ASSERT(tp->t_highest_agno == NULLAGNUMBER);
 
-       trace_xfs_bmap_deferred(tp->t_mountp,
-                       XFS_FSB_TO_AGNO(tp->t_mountp, bmap->br_startblock),
-                       bi->bi_type,
-                       XFS_FSB_TO_AGBNO(tp->t_mountp, bmap->br_startblock),
-                       bi->bi_owner->i_ino, bi->bi_whichfork,
-                       bmap->br_startoff, bmap->br_blockcount,
-                       bmap->br_state);
+       trace_xfs_bmap_deferred(bi);
 
        if (WARN_ON_ONCE(bi->bi_whichfork != XFS_DATA_FORK)) {
                xfs_bmap_mark_sick(bi->bi_owner, bi->bi_whichfork);

diff --git a/libxfs/xfs_bmap.h b/libxfs/xfs_bmap.h
index 10b85865204d6792b6e3cd2057f0c9b03f22cf43..0a2fd9304d1c50617d3049887cb205ac5e19de86 100644 (file)
--- a/libxfs/xfs_bmap.h
+++ b/libxfs/xfs_bmap.h
@@ -232,6 +232,10 @@ enum xfs_bmap_intent_type {
        XFS_BMAP_UNMAP,
 };
 
+#define XFS_BMAP_INTENT_STRINGS \
+       { XFS_BMAP_MAP,         "map" }, \
+       { XFS_BMAP_UNMAP,       "unmap" }
+
 struct xfs_bmap_intent {
        struct list_head                        bi_list;
        enum xfs_bmap_intent_type               bi_type;