Commit 4dfb02d5 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: fix mismerged tracepoints 



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: default avatarDarrick J. Wong <djwong@kernel.org>
parent e2e63b07

fs/xfs/libxfs/xfs_alloc.c

+4 −4
Original line number Diff line number Diff line
@@ -3413,7 +3413,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) {
@@ -3466,7 +3466,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) {
@@ -3500,7 +3500,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) {
@@ -3538,7 +3538,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) {