xfs: clean up extent free log intent item tracepoint callsites

Source kernel commit: 4e0e2c0fe35b44cd4db6a138ed4316178ed60b5c

Pass the incore EFI structure to the tracepoints instead of open-coding
the argument passing.  This cleans up the call sites a bit.

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

diff --git a/include/xfs_trace.h b/include/xfs_trace.h
index 812fbb38e06390285a223344b875e12b84e1c100..f6d6a6ea1af9e1a3c01220edb69bf639930b34f6 100644 (file)
--- a/include/xfs_trace.h
+++ b/include/xfs_trace.h
@@ -14,7 +14,7 @@
 #define trace_xfbtree_trans_commit_buf(...)    ((void) 0)
 
 #define trace_xfs_agfl_reset(a,b,c,d)          ((void) 0)
-#define trace_xfs_agfl_free_defer(a,b,c,d,e)   ((void) 0)
+#define trace_xfs_agfl_free_defer(...)         ((void) 0)
 #define trace_xfs_alloc_cur_check(...)         ((void) 0)
 #define trace_xfs_alloc_cur(a)                 ((void) 0)
 #define trace_xfs_alloc_cur_left(a)            ((void) 0)
@@ -243,8 +243,7 @@
 #define trace_xfs_defer_item_pause(...)                ((void) 0)
 #define trace_xfs_defer_item_unpause(...)      ((void) 0)
 
-#define trace_xfs_bmap_free_defer(...)         ((void) 0)
-#define trace_xfs_bmap_free_deferred(...)      ((void) 0)
+#define trace_xfs_extent_free_defer(...)       ((void) 0)
 
 #define trace_xfs_rmap_map(...)                        ((void) 0)
 #define trace_xfs_rmap_map_error(...)          ((void) 0)

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index ab547d80cd3b50576cd2022032e2b0e02e9eee4b..48fdffd46d573ad8615b55d2078c48b8b31fdafe 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2540,7 +2540,7 @@ xfs_defer_agfl_block(
        xefi->xefi_owner = oinfo->oi_owner;
        xefi->xefi_agresv = XFS_AG_RESV_AGFL;
 
-       trace_xfs_agfl_free_defer(mp, agno, 0, agbno, 1);
+       trace_xfs_agfl_free_defer(mp, xefi);
 
        xfs_extent_free_get_group(mp, xefi);
        xfs_defer_add(tp, &xefi->xefi_list, &xfs_agfl_free_defer_type);
@@ -2602,9 +2602,8 @@ xfs_defer_extent_free(
        } else {
                xefi->xefi_owner = XFS_RMAP_OWN_NULL;
        }
-       trace_xfs_bmap_free_defer(mp,
-                       XFS_FSB_TO_AGNO(tp->t_mountp, bno), 0,
-                       XFS_FSB_TO_AGBNO(tp->t_mountp, bno), len);
+
+       trace_xfs_extent_free_defer(mp, xefi);
 
        xfs_extent_free_get_group(mp, xefi);
        *dfpp = xfs_defer_add(tp, &xefi->xefi_list, &xfs_extent_free_defer_type);