Skip to content

Commit 9e0d12e

Browse files
authored
ZIL: Update Linux tracing after #15635
While picking parts from #14909 I've missed Linux tracing specific ones, that went unnoticed in default configurations, but breaks the build in some. Reviewed-by: Ameer Hamza <[email protected]> Reviewed-by: Brian Atkinson <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Sponsored by: iXsystems, Inc. Closes #15730
1 parent 7b89149 commit 9e0d12e

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

include/os/linux/zfs/sys/trace_zil.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
__field(uint64_t, zl_parse_lr_seq) \
5252
__field(uint64_t, zl_parse_blk_count) \
5353
__field(uint64_t, zl_parse_lr_count) \
54-
__field(uint64_t, zl_cur_used) \
54+
__field(uint64_t, zl_cur_size) \
55+
__field(uint64_t, zl_cur_left) \
56+
__field(uint64_t, zl_cur_max) \
5557
__field(clock_t, zl_replay_time) \
5658
__field(uint64_t, zl_replay_blks)
5759

@@ -72,7 +74,9 @@
7274
__entry->zl_parse_lr_seq = zilog->zl_parse_lr_seq; \
7375
__entry->zl_parse_blk_count = zilog->zl_parse_blk_count;\
7476
__entry->zl_parse_lr_count = zilog->zl_parse_lr_count; \
75-
__entry->zl_cur_used = zilog->zl_cur_used; \
77+
__entry->zl_cur_size = zilog->zl_cur_size; \
78+
__entry->zl_cur_left = zilog->zl_cur_left; \
79+
__entry->zl_cur_max = zilog->zl_cur_max; \
7680
__entry->zl_replay_time = zilog->zl_replay_time; \
7781
__entry->zl_replay_blks = zilog->zl_replay_blks;
7882

@@ -82,7 +86,8 @@
8286
"replay %u stop_sync %u logbias %u sync %u " \
8387
"parse_error %u parse_blk_seq %llu parse_lr_seq %llu " \
8488
"parse_blk_count %llu parse_lr_count %llu " \
85-
"cur_used %llu replay_time %lu replay_blks %llu }"
89+
"cur_size %llu cur_left %llu cur_max %llu replay_time %lu " \
90+
"replay_blks %llu }"
8691

8792
#define ZILOG_TP_PRINTK_ARGS \
8893
__entry->zl_lr_seq, __entry->zl_commit_lr_seq, \
@@ -92,7 +97,8 @@
9297
__entry->zl_stop_sync, __entry->zl_logbias, __entry->zl_sync, \
9398
__entry->zl_parse_error, __entry->zl_parse_blk_seq, \
9499
__entry->zl_parse_lr_seq, __entry->zl_parse_blk_count, \
95-
__entry->zl_parse_lr_count, __entry->zl_cur_used, \
100+
__entry->zl_parse_lr_count, __entry->zl_cur_size, \
101+
__entry->zl_cur_left, __entry->zl_cur_max, \
96102
__entry->zl_replay_time, __entry->zl_replay_blks
97103

98104
#define ITX_TP_STRUCT_ENTRY \

0 commit comments

Comments
 (0)