From: Darrick J. Wong <djwong@kernel.org>
Date: Tue, 9 May 2023 09:34:40 +0000 (+0200)
Subject: xfs: fix mismerged tracepoints
X-Git-Tag: v6.3.0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=002b5d96f1d87620db5cc3b7fa7c690a20d5e7f5;p=thirdparty%2Fxfsprogs-dev.git

xfs: fix mismerged tracepoints

Source kernel commit: 4dfb02d5cae80289384c4d3c6ddfbd92d30aced9

At some point in between sending this patch to the list and merging it
into for-next, the tracepoints got all mixed up because I've
over-reliant on automated tools not sucking.  The end result is that the
tracepoints are all wrong, so fix them.

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

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 56106f2f8..61dad140c 100644
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -3409,7 +3409,7 @@ xfs_alloc_vextent_start_ag(
 	args->agno = NULLAGNUMBER;
 	args->agbno = NULLAGBLOCK;
 
-	trace_xfs_alloc_vextent_first_ag(args);
+	trace_xfs_alloc_vextent_start_ag(args);
 
 	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
 	if (error) {
@@ -3462,7 +3462,7 @@ xfs_alloc_vextent_first_ag(
 	args->agno = NULLAGNUMBER;
 	args->agbno = NULLAGBLOCK;
 
-	trace_xfs_alloc_vextent_start_ag(args);
+	trace_xfs_alloc_vextent_first_ag(args);
 
 	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
 	if (error) {
@@ -3496,7 +3496,7 @@ xfs_alloc_vextent_exact_bno(
 	args->agno = XFS_FSB_TO_AGNO(mp, target);
 	args->agbno = XFS_FSB_TO_AGBNO(mp, target);
 
-	trace_xfs_alloc_vextent_near_bno(args);
+	trace_xfs_alloc_vextent_exact_bno(args);
 
 	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
 	if (error) {
@@ -3534,7 +3534,7 @@ xfs_alloc_vextent_near_bno(
 	args->agno = XFS_FSB_TO_AGNO(mp, target);
 	args->agbno = XFS_FSB_TO_AGBNO(mp, target);
 
-	trace_xfs_alloc_vextent_exact_bno(args);
+	trace_xfs_alloc_vextent_near_bno(args);
 
 	error = xfs_alloc_vextent_check_args(args, target, &minimum_agno);
 	if (error) {