Commit 7cf2663f authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: give refcount btree cursor error tracepoints their own class 



Convert all the refcount tracepoints to use the btree error tracepoint
class.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent ea7b0820

fs/xfs/libxfs/xfs_refcount.c

+14 −28
Original line number Diff line number Diff line
@@ -211,8 +211,7 @@ xfs_refcount_update( 


	error = xfs_btree_update(cur, &rec);

	if (error)

		trace_xfs_refcount_update_error(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, error, _RET_IP_);

		trace_xfs_refcount_update_error(cur, error, _RET_IP_);

	return error;

}
@@ -247,8 +246,7 @@ xfs_refcount_insert( 


out_error:

	if (error)

		trace_xfs_refcount_insert_error(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, error, _RET_IP_);

		trace_xfs_refcount_insert_error(cur, error, _RET_IP_);

	return error;

}
@@ -288,8 +286,7 @@ xfs_refcount_delete( 
			&found_rec);

out_error:

	if (error)

		trace_xfs_refcount_delete_error(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, error, _RET_IP_);

		trace_xfs_refcount_delete_error(cur, error, _RET_IP_);

	return error;

}
@@ -438,8 +435,7 @@ xfs_refcount_split_extent( 
	return error;



out_error:

	trace_xfs_refcount_split_extent_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_split_extent_error(cur, error, _RET_IP_);

	return error;

}
@@ -522,8 +518,7 @@ xfs_refcount_merge_center_extents( 
	return error;



out_error:

	trace_xfs_refcount_merge_center_extents_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_merge_center_extents_error(cur, error, _RET_IP_);

	return error;

}
@@ -589,8 +584,7 @@ xfs_refcount_merge_left_extent( 
	return error;



out_error:

	trace_xfs_refcount_merge_left_extent_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_merge_left_extent_error(cur, error, _RET_IP_);

	return error;

}
@@ -658,8 +652,7 @@ xfs_refcount_merge_right_extent( 
	return error;



out_error:

	trace_xfs_refcount_merge_right_extent_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_merge_right_extent_error(cur, error, _RET_IP_);

	return error;

}
@@ -753,8 +746,7 @@ xfs_refcount_find_left_extents( 
	return error;



out_error:

	trace_xfs_refcount_find_left_extent_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_find_left_extent_error(cur, error, _RET_IP_);

	return error;

}
@@ -848,8 +840,7 @@ xfs_refcount_find_right_extents( 
	return error;



out_error:

	trace_xfs_refcount_find_right_extent_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_find_right_extent_error(cur, error, _RET_IP_);

	return error;

}
@@ -1254,8 +1245,7 @@ xfs_refcount_adjust_extents( 


	return error;

out_error:

	trace_xfs_refcount_modify_extent_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_modify_extent_error(cur, error, _RET_IP_);

	return error;

}
@@ -1315,8 +1305,7 @@ xfs_refcount_adjust( 
	return 0;



out_error:

	trace_xfs_refcount_adjust_error(cur->bc_mp, cur->bc_ag.pag->pag_agno,

			error, _RET_IP_);

	trace_xfs_refcount_adjust_error(cur, error, _RET_IP_);

	return error;

}
@@ -1630,8 +1619,7 @@ xfs_refcount_find_shared( 


out_error:

	if (error)

		trace_xfs_refcount_find_shared_error(cur->bc_mp,

				cur->bc_ag.pag->pag_agno, error, _RET_IP_);

		trace_xfs_refcount_find_shared_error(cur, error, _RET_IP_);

	return error;

}
@@ -1786,8 +1774,7 @@ xfs_refcount_adjust_cow_extents( 


	return error;

out_error:

	trace_xfs_refcount_modify_extent_error(cur->bc_mp,

			cur->bc_ag.pag->pag_agno, error, _RET_IP_);

	trace_xfs_refcount_modify_extent_error(cur, error, _RET_IP_);

	return error;

}
@@ -1833,8 +1820,7 @@ xfs_refcount_adjust_cow( 
	return 0;



out_error:

	trace_xfs_refcount_adjust_cow_error(cur->bc_mp, cur->bc_ag.pag->pag_agno,

			error, _RET_IP_);

	trace_xfs_refcount_adjust_cow_error(cur, error, _RET_IP_);

	return error;

}

fs/xfs/xfs_trace.h

+13 −13
Original line number Diff line number Diff line
@@ -3461,9 +3461,9 @@ DEFINE_REFCOUNT_EXTENT_EVENT(xfs_refcount_get); 
DEFINE_REFCOUNT_EXTENT_EVENT(xfs_refcount_update);

DEFINE_REFCOUNT_EXTENT_EVENT(xfs_refcount_insert);

DEFINE_REFCOUNT_EXTENT_EVENT(xfs_refcount_delete);

DEFINE_AG_ERROR_EVENT(xfs_refcount_insert_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_delete_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_update_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_insert_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_delete_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_update_error);



/* refcount adjustment tracepoints */

DEFINE_AG_EXTENT_EVENT(xfs_refcount_increase);
@@ -3478,20 +3478,20 @@ DEFINE_REFCOUNT_DOUBLE_EXTENT_EVENT(xfs_refcount_merge_left_extent); 
DEFINE_REFCOUNT_DOUBLE_EXTENT_EVENT(xfs_refcount_merge_right_extent);

DEFINE_REFCOUNT_DOUBLE_EXTENT_AT_EVENT(xfs_refcount_find_left_extent);

DEFINE_REFCOUNT_DOUBLE_EXTENT_AT_EVENT(xfs_refcount_find_right_extent);

DEFINE_AG_ERROR_EVENT(xfs_refcount_adjust_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_adjust_cow_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_merge_center_extents_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_modify_extent_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_split_extent_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_merge_left_extent_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_merge_right_extent_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_find_left_extent_error);

DEFINE_AG_ERROR_EVENT(xfs_refcount_find_right_extent_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_adjust_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_adjust_cow_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_merge_center_extents_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_modify_extent_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_split_extent_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_merge_left_extent_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_merge_right_extent_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_find_left_extent_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_find_right_extent_error);



/* reflink helpers */

DEFINE_AG_EXTENT_EVENT(xfs_refcount_find_shared);

DEFINE_AG_EXTENT_EVENT(xfs_refcount_find_shared_result);

DEFINE_AG_ERROR_EVENT(xfs_refcount_find_shared_error);

DEFINE_BTREE_ERROR_EVENT(xfs_refcount_find_shared_error);



DECLARE_EVENT_CLASS(xfs_refcount_deferred_class,

	TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno,