Update ZIL trace point

* Remove zl_itx_list_sz from the ZIL trace point formatting. * Minor formating fix to align with upstream code Signed-off-by: Brian Behlendorf <[email protected]>
openzfs · Jun 5, 2017 · d2c3a91 · d2c3a91
1 parent 8871c17
commit d2c3a91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/include/sys/trace_zil.h b/include/sys/trace_zil.h
@@ -63,7 +63,6 @@ DECLARE_EVENT_CLASS(zfs_zil_class,
 	    __field(uint64_t,	zl_parse_lr_count)
 	    __field(uint64_t,	zl_next_batch)
 	    __field(uint64_t,	zl_com_batch)
-	    __field(uint64_t,	zl_itx_list_sz)
 	    __field(uint64_t,	zl_cur_used)
 	    __field(clock_t,	zl_replay_time)
 	    __field(uint64_t,	zl_replay_blks)
@@ -88,7 +87,6 @@ DECLARE_EVENT_CLASS(zfs_zil_class,
 	    __entry->zl_parse_lr_count	= zilog->zl_parse_lr_count;
 	    __entry->zl_next_batch	= zilog->zl_next_batch;
 	    __entry->zl_com_batch	= zilog->zl_com_batch;
-	    __entry->zl_itx_list_sz	= zilog->zl_itx_list_sz;
 	    __entry->zl_cur_used	= zilog->zl_cur_used;
 	    __entry->zl_replay_time	= zilog->zl_replay_time;
 	    __entry->zl_replay_blks	= zilog->zl_replay_blks;
@@ -98,17 +96,15 @@ DECLARE_EVENT_CLASS(zfs_zil_class,
 	    "replay %u stop_sync %u writer %u logbias %u sync %u "
 	    "parse_error %u parse_blk_seq %llu parse_lr_seq %llu "
 	    "parse_blk_count %llu parse_lr_count %llu next_batch %llu "
-	    "com_batch %llu itx_list_sz %llu cur_used %llu replay_time %lu "
-	    "replay_blks %llu }",
+	    "com_batch %llu cur_used %llu replay_time %lu replay_blks %llu }",
 	    __entry->zl_lr_seq, __entry->zl_commit_lr_seq,
 	    __entry->zl_destroy_txg, __entry->zl_replaying_seq,
 	    __entry->zl_suspend, __entry->zl_suspending, __entry->zl_keep_first,
 	    __entry->zl_replay, __entry->zl_stop_sync, __entry->zl_writer,
 	    __entry->zl_logbias, __entry->zl_sync, __entry->zl_parse_error,
 	    __entry->zl_parse_blk_seq, __entry->zl_parse_lr_seq,
 	    __entry->zl_parse_blk_count, __entry->zl_parse_lr_count,
-	    __entry->zl_next_batch, __entry->zl_com_batch,
-	    __entry->zl_itx_list_sz, __entry->zl_cur_used,
+	    __entry->zl_next_batch, __entry->zl_com_batch, __entry->zl_cur_used,
 	    __entry->zl_replay_time, __entry->zl_replay_blks)
 );
 /* END CSTYLED */

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
@@ -3106,9 +3106,8 @@ zio_alloc_zil(spa_t *spa, uint64_t txg, blkptr_t *new_bp, uint64_t size,
 	ASSERT(txg > spa_syncing_txg(spa));
 
 	metaslab_trace_init(&io_alloc_list);
-	error = metaslab_alloc(spa, spa_log_class(spa), size,
-	    new_bp, 1, txg, NULL, METASLAB_FASTWRITE,
-	    &io_alloc_list, NULL);
+	error = metaslab_alloc(spa, spa_log_class(spa), size, new_bp, 1,
+	    txg, NULL, METASLAB_FASTWRITE, &io_alloc_list, NULL);
 	if (error == 0) {
 		*slog = TRUE;
 	} else {