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: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 4d8bb760c7235811f2414c2fa7a7300391ca9cce..77acd311aa55ce364831b42c36813f8fae2d4645 100644 (file)
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -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 @@ not_found:
        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 @@ not_found:
        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 @@ advloop:
 
        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 @@ done:
 
 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;
 }
 

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 0c235bdea73858479b02d8f7d98c21ae32bbc7af..42a8f89c8d425b9dec100ee58526a0b708ed80f7 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -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,