[PATCH 11/36] xfs: pass objects to the xfs_irec_merge_{pre,post} trace points

Darrick J. Wong
2024-12-06T23:33:08Z

From: Christoph Hellwig <hch@lst.de>

Source kernel commit: 487092ceaa72448ca3a82ea9fb89768c88f6abec

Pass the perag structure and the irec to these tracepoints so that the
decoding is only done when tracing is actually enabled and the call sites
look a lot neater.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
include/xfs_trace.h | 4 ++--
libxfs/xfs_ialloc.c | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/xfs_trace.h b/include/xfs_trace.h
index ba51419b3df3d3..0986e1621437d4 100644
--- a/include/xfs_trace.h
+++ b/include/xfs_trace.h
@@ -85,8 +85,8 @@
#define trace_xfs_alloc_read_agf(a,b) ((void) 0)
#define trace_xfs_read_agi(a,b) ((void) 0)
#define trace_xfs_ialloc_read_agi(a,b) ((void) 0)
-#define trace_xfs_irec_merge_pre(a,b,c,d,e,f) ((void) 0)
-#define trace_xfs_irec_merge_post(a,b,c,d) ((void) 0)
+#define trace_xfs_irec_merge_pre(...) ((void) 0)
+#define trace_xfs_irec_merge_post(...) ((void) 0)

#define trace_xfs_iext_insert(a,b,c,d) ((void) 0)
#define trace_xfs_iext_remove(a,b,c,d) ((void) 0)
diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 01b2e2d8c27c22..b3d6f7f4212588 100644
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -601,15 +601,12 @@ xfs_inobt_insert_sprec(
goto error;
}

- trace_xfs_irec_merge_pre(mp, pag->pag_agno, rec.ir_startino,
- rec.ir_holemask, nrec->ir_startino,
- nrec->ir_holemask);
+ trace_xfs_irec_merge_pre(pag, &rec, nrec);

/* merge to nrec to output the updated record */
__xfs_inobt_rec_merge(nrec, &rec);

- trace_xfs_irec_merge_post(mp, pag->pag_agno, nrec->ir_startino,
- nrec->ir_holemask);
+ trace_xfs_irec_merge_post(pag, nrec);

error = xfs_inobt_rec_check_count(mp, nrec);
if (error)