Minor tracepoints cleanups
Subsystems (2)
David Sterba
maintainercover Minor tracepoints cleanups
David Sterba (2):
btrfs: tracepoints: drop typecasts from printk
btrfs: tracepoints: constify all pointers
include/trace/events/btrfs.h | 80 ++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 41 deletions(-)
Signature · 1 line
2.23.0
David Sterba
maintainerPATCH 1/2 btrfs: tracepoints: drop typecasts from printk
Remove typecasts from trace printk, adjust types and move typecast to the assignment if necessary. When assigning, the types are more obvious compared to matching the variables to the format strings.
Signed-off-by David Sterba <[email protected]>
--- include/trace/events/btrfs.h | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
include/trace/events/btrfs.h +13 -15
@@ -170,7 +170,7 @@ DECLARE_EVENT_CLASS(btrfs__inode,TP_STRUCT__entry_btrfs (__field (u64 ,ino ) -__field ( blkcnt_t, blocks ) +__field ( u64, blocks )__field ( u64, disk_i_size )__field ( u64, generation ) __field( u64, last_trans )
@@ -194,7 +194,7 @@ DECLARE_EVENT_CLASS(btrfs__inode,show_root_type (__entry->root_objectid), __entry->generation, __entry->ino, - (unsigned long long )__entry->blocks, + __entry->blocks, __entry->disk_i_size, __entry->last_trans, __entry->logged_trans)
@@ -574,7 +574,7 @@ DECLARE_EVENT_CLASS(btrfs__writepage, __field( char, for_kupdate ) __field( char, for_reclaim ) __field( char, range_cyclic ) - __field( pgoff_t, writeback_index ) + __field( unsigned long, writeback_index ) __field( u64, root_objectid ) ),
@@ -603,7 +603,7 @@ DECLARE_EVENT_CLASS(btrfs__writepage, __entry->range_start, __entry->range_end, __entry->for_kupdate, __entry->for_reclaim, __entry->range_cyclic, - (unsigned long)__entry->writeback_index) + __entry->writeback_index) ); DEFINE_EVENT(btrfs__writepage, __extent_writepage,
@@ -622,7 +622,7 @@ TRACE_EVENT(btrfs_writepage_end_io_hook,TP_STRUCT__entry_btrfs (__field (u64 ,ino ) -__field ( pgoff_t, index ) + __field( unsigned long, index )__field ( u64, start )__field ( u64, end ) __field( int, uptodate )
@@ -642,7 +642,7 @@ TRACE_EVENT(btrfs_writepage_end_io_hook,TP_printk_btrfs ("root=%llu(%s) ino=%llu page_index=%lu start=%llu " "end=%llu uptodate=%d" ,show_root_type (__entry->root_objectid), - __entry->ino, (unsigned long )__entry->index, + __entry->ino, __entry->index, __entry->start, __entry->end, __entry->uptodate) );
@@ -1325,17 +1325,17 @@ TRACE_EVENT(alloc_extent_state, TP_STRUCT__entry( __field(const struct extent_state *, state) __field(gfp_t, mask) - __field(unsigned long, ip) + __field(const void*, ip) ), TP_fast_assign( __entry->state = state, __entry->mask = mask, - __entry->ip = IP + __entry->ip = (const void *)IP ), TP_printk("state=%p mask=%s caller=%pS", __entry->state, - show_gfp_flags(__entry->mask), (const void *)__entry->ip) + show_gfp_flags(__entry->mask), __entry->ip) ); TRACE_EVENT(free_extent_state,
@@ -1346,16 +1346,15 @@ TRACE_EVENT(free_extent_state, TP_STRUCT__entry( __field(const struct extent_state *, state) - __field(unsigned long, ip) + __field(const void*, ip) ), TP_fast_assign( __entry->state = state, - __entry->ip = IP + __entry->ip = (const void *)IP ), - TP_printk("state=%p caller=%pS", __entry->state, - (const void *)__entry->ip) + TP_printk("state=%p caller=%pS", __entry->state, __entry->ip) ); DECLARE_EVENT_CLASS(btrfs__work,
@@ -1567,8 +1566,7 @@ DECLARE_EVENT_CLASS(btrfs_qgroup_extent, ),TP_printk_btrfs ("bytenr=%llu num_bytes=%llu" , - (unsigned long long )__entry->bytenr, - (unsigned long long )__entry->num_bytes) + __entry->bytenr, __entry->num_bytes) ); DEFINE_EVENT(btrfs_qgroup_extent, btrfs_qgroup_account_extents,
Signature · 1 line
2.23.0
David Sterba
maintainerPATCH 2/2 btrfs: tracepoints: constify all pointers
In reply to David SterbaWe don't modify the data passed to tracepoints, some of the declarations are already const, add it to the rest.
Signed-off-by David Sterba <[email protected]>
--- include/trace/events/btrfs.h | 52 ++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-)
include/trace/events/btrfs.h +26 -26
@@ -292,7 +292,7 @@ TRACE_EVENT_CONDITION(btrfs_get_extent, TRACE_EVENT(btrfs_handle_em_exist, - TP_PROTO(struct btrfs_fs_info *fs_info, + TP_PROTO(const struct btrfs_fs_info *fs_info, const struct extent_map *existing, const struct extent_map *map, u64 start, u64 len),
@@ -330,8 +330,8 @@ TRACE_EVENT(btrfs_handle_em_exist,/* file extent item */ DECLARE_EVENT_CLASS(btrfs__file_extent_item_regular, - TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, - struct btrfs_file_extent_item *fi, u64 start), + TP_PROTO(const struct btrfs_inode *bi, const struct extent_buffer *l, + const struct btrfs_file_extent_item *fi, u64 start), TP_ARGS(bi, l, fi, start),
@@ -385,8 +385,8 @@ DECLARE_EVENT_CLASS(btrfs__file_extent_item_regular, DECLARE_EVENT_CLASS( btrfs__file_extent_item_inline, - TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, - struct btrfs_file_extent_item *fi, int slot, u64 start), + TP_PROTO(const struct btrfs_inode *bi, const struct extent_buffer *l, + const struct btrfs_file_extent_item *fi, int slot, u64 start), TP_ARGS(bi, l, fi, slot, start),
@@ -426,8 +426,8 @@ DECLARE_EVENT_CLASS(DEFINE_EVENT ( btrfs__file_extent_item_regular, btrfs_get_extent_show_fi_regular, - TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, - struct btrfs_file_extent_item *fi, u64 start), + TP_PROTO(const struct btrfs_inode *bi, const struct extent_buffer *l, + const struct btrfs_file_extent_item *fi, u64 start),TP_ARGS (bi, l, fi, start) );
@@ -435,8 +435,8 @@ DEFINE_EVENT(DEFINE_EVENT ( btrfs__file_extent_item_regular, btrfs_truncate_show_fi_regular, - TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, - struct btrfs_file_extent_item *fi, u64 start), + TP_PROTO(const struct btrfs_inode *bi, const struct extent_buffer *l, + const struct btrfs_file_extent_item *fi, u64 start),TP_ARGS (bi, l, fi, start) );
@@ -444,8 +444,8 @@ DEFINE_EVENT(DEFINE_EVENT ( btrfs__file_extent_item_inline, btrfs_get_extent_show_fi_inline, - TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, - struct btrfs_file_extent_item *fi, int slot, u64 start), + TP_PROTO(const struct btrfs_inode *bi, const struct extent_buffer *l, + const struct btrfs_file_extent_item *fi, int slot, u64 start),TP_ARGS (bi, l, fi, slot, start) );
@@ -453,8 +453,8 @@ DEFINE_EVENT(DEFINE_EVENT ( btrfs__file_extent_item_inline, btrfs_truncate_show_fi_inline, - TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l, - struct btrfs_file_extent_item *fi, int slot, u64 start), + TP_PROTO(const struct btrfs_inode *bi, const struct extent_buffer *l, + const struct btrfs_file_extent_item *fi, int slot, u64 start),TP_ARGS (bi, l, fi, slot, start) );
@@ -1018,7 +1018,7 @@ TRACE_EVENT(btrfs_cow_block, TRACE_EVENT(btrfs_space_reservation, - TP_PROTO(const struct btrfs_fs_info *fs_info, char *type, u64 val, + TP_PROTO(const struct btrfs_fs_info *fs_info, const char *type, u64 val, u64 bytes, int reserve), TP_ARGS(fs_info, type, val, bytes, reserve),
@@ -1051,7 +1051,7 @@ TRACE_EVENT(btrfs_space_reservation, TRACE_EVENT(btrfs_trigger_flush, TP_PROTO(const struct btrfs_fs_info *fs_info, u64 flags, u64 bytes, - int flush, char *reason), + int flush, const char *reason), TP_ARGS(fs_info, flags, bytes, flush, reason),
@@ -1642,7 +1642,7 @@ TRACE_EVENT(btrfs_qgroup_account_extent, TRACE_EVENT(qgroup_update_counters, TP_PROTO(const struct btrfs_fs_info *fs_info, - struct btrfs_qgroup *qgroup, + const struct btrfs_qgroup *qgroup, u64 cur_old_count, u64 cur_new_count), TP_ARGS(fs_info, qgroup, cur_old_count, cur_new_count),
@@ -1822,7 +1822,7 @@ DEFINE_EVENT(btrfs__prelim_ref, btrfs_prelim_ref_insert, ); TRACE_EVENT(btrfs_inode_mod_outstanding_extents, - TP_PROTO(struct btrfs_root *root, u64 ino, int mod), + TP_PROTO(const struct btrfs_root *root, u64 ino, int mod), TP_ARGS(root, ino, mod),
@@ -1903,7 +1903,7 @@ TRACE_EVENT(btrfs_set_extent_bit,TP_fast_assign_btrfs (tree->fs_info, __entry->owner = tree->owner;if (tree->private_data) { -struct inode *inode = tree->private_data; +const struct inode *inode = tree->private_data; __entry->ino =btrfs_ino (BTRFS_I (inode)); __entry->rootid =
@@ -1942,7 +1942,7 @@ TRACE_EVENT(btrfs_clear_extent_bit,TP_fast_assign_btrfs (tree->fs_info, __entry->owner = tree->owner;if (tree->private_data) { -struct inode *inode = tree->private_data; +const struct inode *inode = tree->private_data; __entry->ino =btrfs_ino (BTRFS_I (inode)); __entry->rootid =
@@ -1982,7 +1982,7 @@ TRACE_EVENT(btrfs_convert_extent_bit,TP_fast_assign_btrfs (tree->fs_info, __entry->owner = tree->owner;if (tree->private_data) { -struct inode *inode = tree->private_data; +const struct inode *inode = tree->private_data; __entry->ino =btrfs_ino (BTRFS_I (inode)); __entry->rootid =
@@ -2091,8 +2091,8 @@ DEFINE_BTRFS_LOCK_EVENT(btrfs_tree_read_lock_atomic); DECLARE_EVENT_CLASS(btrfs__space_info_update, - TP_PROTO(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *sinfo, u64 old, s64 diff), + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_space_info *sinfo, u64 old, s64 diff), TP_ARGS(fs_info, sinfo, old, diff),
@@ -2114,16 +2114,16 @@ DECLARE_EVENT_CLASS(btrfs__space_info_update,DEFINE_EVENT (btrfs__space_info_update, update_bytes_may_use, - TP_PROTO(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *sinfo, u64 old, s64 diff), + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_space_info *sinfo, u64 old, s64 diff),TP_ARGS (fs_info, sinfo, old, diff) );DEFINE_EVENT (btrfs__space_info_update, update_bytes_pinned, - TP_PROTO(struct btrfs_fs_info *fs_info, - struct btrfs_space_info *sinfo, u64 old, s64 diff), + TP_PROTO(const struct btrfs_fs_info *fs_info, + const struct btrfs_space_info *sinfo, u64 old, s64 diff),TP_ARGS (fs_info, sinfo, old, diff) );
Signature · 1 line
2.23.0