From 7a36a289d252a0a1bbd6db870c7737a269f24e09 Mon Sep 17 00:00:00 2001
From: Zach Brown <zab@versity.com>
Date: Fri, 21 Jun 2019 15:52:21 -0700
Subject: [PATCH] scoutfs: add rid to trace messages

Add the mount rid to traces which included the fsid by converting them
to use the super block message format and args.

Signed-off-by: Zach Brown <zab@versity.com>
---
 kmod/src/scoutfs_trace.h | 530 +++++++++++++++++++--------------------
 1 file changed, 264 insertions(+), 266 deletions(-)

diff --git a/kmod/src/scoutfs_trace.h b/kmod/src/scoutfs_trace.h
index a9c6cfe3..20fc1282 100644
--- a/kmod/src/scoutfs_trace.h
+++ b/kmod/src/scoutfs_trace.h
@@ -41,16 +41,13 @@
 
 struct lock_info;
 
-#define FSID_ARG(sb)	le64_to_cpu(SCOUTFS_SB(sb)->super.hdr.fsid)
-#define FSID_FMT	"%llx"
-
 TRACE_EVENT(scoutfs_setattr,
 	TP_PROTO(struct dentry *dentry, struct iattr *attr),
 
 	TP_ARGS(dentry, attr),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(unsigned int, d_len)
 		__string(d_name, dentry->d_name.name)
@@ -61,7 +58,7 @@ TRACE_EVENT(scoutfs_setattr,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(dentry->d_inode->i_sb);
+		SCSB_TRACE_ASSIGN(dentry->d_inode->i_sb);
 		__entry->ino = scoutfs_ino(dentry->d_inode);
 		__entry->d_len = dentry->d_name.len;
 		__assign_str(d_name, dentry->d_name.name);
@@ -71,8 +68,8 @@ TRACE_EVENT(scoutfs_setattr,
 		__entry->i_size = i_size_read(dentry->d_inode);
 	),
 
-	TP_printk(FSID_FMT" %s ino %llu ia_valid 0x%x size change %d ia_size "
-		  "%llu i_size %llu", __entry->fsid, __get_str(d_name),
+	TP_printk(SCSBF" %s ino %llu ia_valid 0x%x size change %d ia_size "
+		  "%llu i_size %llu", SCSB_TRACE_ARGS, __get_str(d_name),
 		  __entry->ino, __entry->ia_valid, __entry->size_change,
 		  __entry->ia_size, __entry->i_size)
 );
@@ -83,21 +80,21 @@ TRACE_EVENT(scoutfs_complete_truncate,
 	TP_ARGS(inode, flags),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(__u64, i_size)
 		__field(__u32, flags)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(inode->i_sb);
+		SCSB_TRACE_ASSIGN(inode->i_sb);
 		__entry->ino = scoutfs_ino(inode);
 		__entry->i_size = i_size_read(inode);
 		__entry->flags = flags;
 	),
 
-	TP_printk(FSID_FMT" ino %llu i_size %llu flags 0x%x",
-		  __entry->fsid, __entry->ino, __entry->i_size,
+	TP_printk(SCSBF" ino %llu i_size %llu flags 0x%x",
+		  SCSB_TRACE_ARGS, __entry->ino, __entry->i_size,
 		  __entry->flags)
 );
 
@@ -107,18 +104,18 @@ DECLARE_EVENT_CLASS(scoutfs_comp_class,
 	TP_ARGS(sb, comp),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(struct scoutfs_bio_completion *, comp)
 		__field(int, pending)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->comp = comp;
 		__entry->pending = atomic_read(&comp->pending);
 	),
 
-	TP_printk(FSID_FMT" comp %p pending before %d", __entry->fsid,
+	TP_printk(SCSBF" comp %p pending before %d", SCSB_TRACE_ARGS,
 		  __entry->comp, __entry->pending)
 );
 DEFINE_EVENT(scoutfs_comp_class, comp_end_io,
@@ -156,20 +153,20 @@ DECLARE_EVENT_CLASS(scoutfs_bio_class,
 	TP_ARGS(sb, bio, args, in_flight),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(void *, bio)
 		__field(void *, args)
 		__field(int, in_flight)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->bio = bio;
 		__entry->args = args;
 		__entry->in_flight = in_flight;
 	),
 
-	TP_printk(FSID_FMT" bio %p args %p in_flight %d", __entry->fsid,
+	TP_printk(SCSBF" bio %p args %p in_flight %d", SCSB_TRACE_ARGS,
 		  __entry->bio, __entry->args, __entry->in_flight)
 );
 
@@ -189,20 +186,20 @@ TRACE_EVENT(scoutfs_bio_end_io,
 	TP_ARGS(sb, bio, size, err),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(void *, bio)
 		__field(int, size)
 		__field(int, err)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->bio = bio;
 		__entry->size = size;
 		__entry->err = err;
 	),
 
-	TP_printk(FSID_FMT" bio %p size %u err %d", __entry->fsid,
+	TP_printk(SCSBF" bio %p size %u err %d", SCSB_TRACE_ARGS,
 		  __entry->bio, __entry->size, __entry->err)
 );
 
@@ -212,20 +209,20 @@ TRACE_EVENT(scoutfs_dec_end_io,
 	TP_ARGS(sb, args, in_flight, err),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(void *, args)
 		__field(int, in_flight)
 		__field(int, err)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->args = args;
 		__entry->in_flight = in_flight;
 		__entry->err = err;
 	),
 
-	TP_printk(FSID_FMT" args %p in_flight %d err %d", __entry->fsid,
+	TP_printk(SCSBF" args %p in_flight %d err %d", SCSB_TRACE_ARGS,
 		  __entry->args, __entry->in_flight, __entry->err)
 );
 
@@ -235,19 +232,19 @@ DECLARE_EVENT_CLASS(scoutfs_key_ret_class,
 	TP_ARGS(sb, key, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		sk_trace_define(key)
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		sk_trace_assign(key, key);
 		__entry->ret = ret;
 	),
 
-	TP_printk("fsid "FSID_FMT" key "SK_FMT" ret %d",
-		  __entry->fsid, sk_trace_args(key), __entry->ret)
+	TP_printk(SCSBF" key "SK_FMT" ret %d",
+		  SCSB_TRACE_ARGS, sk_trace_args(key), __entry->ret)
 );
 
 DEFINE_EVENT(scoutfs_key_ret_class, scoutfs_item_create,
@@ -269,16 +266,16 @@ TRACE_EVENT(scoutfs_item_dirty_ret,
 	TP_ARGS(sb, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ret %d", __entry->fsid, __entry->ret)
+	TP_printk(SCSBF" ret %d", SCSB_TRACE_ARGS, __entry->ret)
 );
 
 TRACE_EVENT(scoutfs_item_update_ret,
@@ -287,16 +284,16 @@ TRACE_EVENT(scoutfs_item_update_ret,
 	TP_ARGS(sb, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ret %d", __entry->fsid, __entry->ret)
+	TP_printk(SCSBF" ret %d", SCSB_TRACE_ARGS, __entry->ret)
 );
 
 TRACE_EVENT(scoutfs_item_next_ret,
@@ -305,16 +302,16 @@ TRACE_EVENT(scoutfs_item_next_ret,
 	TP_ARGS(sb, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ret %d", __entry->fsid, __entry->ret)
+	TP_printk(SCSBF" ret %d", SCSB_TRACE_ARGS, __entry->ret)
 );
 
 TRACE_EVENT(scoutfs_item_prev_ret,
@@ -323,16 +320,16 @@ TRACE_EVENT(scoutfs_item_prev_ret,
 	TP_ARGS(sb, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ret = ret;
 	),
 
-	TP_printk("fsid "FSID_FMT" ret %d", __entry->fsid, __entry->ret)
+	TP_printk(SCSBF" ret %d", SCSB_TRACE_ARGS, __entry->ret)
 );
 
 TRACE_EVENT(scoutfs_erase_item,
@@ -341,16 +338,16 @@ TRACE_EVENT(scoutfs_erase_item,
 	TP_ARGS(sb, item),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(void *, item)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->item = item;
 	),
 
-	TP_printk(FSID_FMT" erasing item %p", __entry->fsid, __entry->item)
+	TP_printk(SCSBF" erasing item %p", SCSB_TRACE_ARGS, __entry->item)
 );
 
 TRACE_EVENT(scoutfs_data_fallocate,
@@ -360,7 +357,7 @@ TRACE_EVENT(scoutfs_data_fallocate,
 	TP_ARGS(sb, ino, mode, offset, len, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(int, mode)
 		__field(__u64, offset)
@@ -369,7 +366,7 @@ TRACE_EVENT(scoutfs_data_fallocate,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->mode = mode;
 		__entry->offset = offset;
@@ -377,8 +374,8 @@ TRACE_EVENT(scoutfs_data_fallocate,
 		__entry->ret = ret;
 	),
 
-	TP_printk("fsid "FSID_FMT" ino %llu mode 0x%x offset %llu len %llu ret %d",
-		__entry->fsid, __entry->ino, __entry->mode, __entry->offset,
+	TP_printk(SCSBF" ino %llu mode 0x%x offset %llu len %llu ret %d",
+		SCSB_TRACE_ARGS, __entry->ino, __entry->mode, __entry->offset,
 		__entry->len, __entry->ret)
 );
 
@@ -389,20 +386,20 @@ TRACE_EVENT(scoutfs_data_fiemap,
 	TP_ARGS(sb, off, i, blkno),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, off)
 		__field(int, i)
 		__field(__u64, blkno)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->off = off;
 		__entry->i = i;
 		__entry->blkno = blkno;
 	),
 
-	TP_printk(FSID_FMT" blk_off %llu i %u blkno %llu", __entry->fsid,
+	TP_printk(SCSBF" blk_off %llu i %u blkno %llu", SCSB_TRACE_ARGS,
 		  __entry->off, __entry->i, __entry->blkno)
 );
 
@@ -413,7 +410,7 @@ TRACE_EVENT(scoutfs_get_block,
 	TP_ARGS(sb, ino, iblock, create, ret, blkno, size),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(__u64, iblock)
 		__field(int, create)
@@ -423,7 +420,7 @@ TRACE_EVENT(scoutfs_get_block,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->iblock = iblock;
 		__entry->create = create;
@@ -432,8 +429,8 @@ TRACE_EVENT(scoutfs_get_block,
 		__entry->size = size;
 	),
 
-	TP_printk(FSID_FMT" ino %llu iblock %llu create %d ret %d bnr %llu "
-		  "size %zu", __entry->fsid, __entry->ino, __entry->iblock,
+	TP_printk(SCSBF" ino %llu iblock %llu create %d ret %d bnr %llu "
+		  "size %zu", SCSB_TRACE_ARGS, __entry->ino, __entry->iblock,
 		  __entry->create, __entry->ret, __entry->blkno, __entry->size)
 );
 
@@ -445,7 +442,7 @@ TRACE_EVENT(scoutfs_data_alloc_block,
 	TP_ARGS(sb, inode, ext, iblock, len, online_blocks, offline_blocks),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		se_trace_define(ext)
 		__field(__u64, iblock)
@@ -455,7 +452,7 @@ TRACE_EVENT(scoutfs_data_alloc_block,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = scoutfs_ino(inode);
 		se_trace_assign(ext, ext);
 		__entry->iblock = iblock;
@@ -464,8 +461,8 @@ TRACE_EVENT(scoutfs_data_alloc_block,
 		__entry->offline_blocks = offline_blocks;
 	),
 
-	TP_printk("fsid "FSID_FMT" ino %llu ext "SE_FMT" iblock %llu len %llu online_blocks %llu offline_blocks %llu",
-		  __entry->fsid, __entry->ino, se_trace_args(ext),
+	TP_printk(SCSBF" ino %llu ext "SE_FMT" iblock %llu len %llu online_blocks %llu offline_blocks %llu",
+		  SCSB_TRACE_ARGS, __entry->ino, se_trace_args(ext),
 		  __entry->iblock, __entry->len, __entry->online_blocks,
 		  __entry->offline_blocks)
 );
@@ -476,18 +473,18 @@ TRACE_EVENT(scoutfs_data_alloc_block_ret,
 	TP_ARGS(sb, ext, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		se_trace_define(ext)
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		se_trace_assign(ext, ext);
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ext "SE_FMT" ret %d", __entry->fsid,
+	TP_printk(SCSBF" ext "SE_FMT" ret %d", SCSB_TRACE_ARGS,
 		se_trace_args(ext), __entry->ret)
 );
 
@@ -497,20 +494,20 @@ TRACE_EVENT(scoutfs_data_truncate_items,
 	TP_ARGS(sb, iblock, last, offline),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, iblock)
 		__field(__u64, last)
 		__field(int, offline)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->iblock = iblock;
 		__entry->last = last;
 		__entry->offline = offline;
 	),
 
-	TP_printk(FSID_FMT" iblock %llu last %llu offline %u", __entry->fsid,
+	TP_printk(SCSBF" iblock %llu last %llu offline %u", SCSB_TRACE_ARGS,
 		  __entry->iblock, __entry->last, __entry->offline)
 );
 
@@ -522,7 +519,7 @@ TRACE_EVENT(scoutfs_data_wait_check,
 	TP_ARGS(sb, ino, pos, len, sef, op, ext_start, ext_len, ext_flags, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(__u64, pos)
 		__field(__u64, len)
@@ -535,7 +532,7 @@ TRACE_EVENT(scoutfs_data_wait_check,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->pos = pos;
 		__entry->len = len;
@@ -547,10 +544,10 @@ TRACE_EVENT(scoutfs_data_wait_check,
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ino %llu pos %llu len %llu sef 0x%x op 0x%x ext_start %llu ext_len %llu ext_flags 0x%x ret %d",
-			__entry->fsid, __entry->ino, __entry->pos, __entry->len,
-			__entry->sef, __entry->op, __entry->ext_start,
-			__entry->ext_len, __entry->ext_flags, __entry->ret)
+	TP_printk(SCSBF" ino %llu pos %llu len %llu sef 0x%x op 0x%x ext_start %llu ext_len %llu ext_flags 0x%x ret %d",
+		  SCSB_TRACE_ARGS, __entry->ino, __entry->pos, __entry->len,
+		  __entry->sef, __entry->op, __entry->ext_start,
+		  __entry->ext_len, __entry->ext_flags, __entry->ret)
 );
 
 TRACE_EVENT(scoutfs_sync_fs,
@@ -559,16 +556,16 @@ TRACE_EVENT(scoutfs_sync_fs,
 	TP_ARGS(sb, wait),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, wait)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->wait = wait;
 	),
 
-	TP_printk(FSID_FMT" wait %d", __entry->fsid, __entry->wait)
+	TP_printk(SCSBF" wait %d", SCSB_TRACE_ARGS, __entry->wait)
 );
 
 TRACE_EVENT(scoutfs_trans_write_func,
@@ -577,16 +574,16 @@ TRACE_EVENT(scoutfs_trans_write_func,
 	TP_ARGS(sb, dirty),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, dirty)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->dirty = dirty;
 	),
 
-	TP_printk(FSID_FMT" dirty %d", __entry->fsid, __entry->dirty)
+	TP_printk(SCSBF" dirty %d", SCSB_TRACE_ARGS, __entry->dirty)
 );
 
 TRACE_EVENT(scoutfs_release_trans,
@@ -600,7 +597,7 @@ TRACE_EVENT(scoutfs_release_trans,
 		tri_items, tri_vals),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(void *, rsv)
 		__field(unsigned int, rsv_holders)
 		__field(int, res_items)
@@ -614,7 +611,7 @@ TRACE_EVENT(scoutfs_release_trans,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->rsv = rsv;
 		__entry->rsv_holders = rsv_holders;
 		__entry->res_items = res->items;
@@ -627,9 +624,9 @@ TRACE_EVENT(scoutfs_release_trans,
 		__entry->tri_vals = tri_vals;
 	),
 
-	TP_printk(FSID_FMT" rsv %p holders %u reserved %u.%u actual "
+	TP_printk(SCSBF" rsv %p holders %u reserved %u.%u actual "
 		  "%d.%d, trans holders %u writing %u reserved "
-		  "%u.%u", __entry->fsid, __entry->rsv, __entry->rsv_holders,
+		  "%u.%u", SCSB_TRACE_ARGS, __entry->rsv, __entry->rsv_holders,
 		  __entry->res_items, __entry->res_vals, __entry->act_items,
 		  __entry->act_vals, __entry->tri_holders, __entry->tri_writing,
 		  __entry->tri_items, __entry->tri_vals)
@@ -647,7 +644,7 @@ TRACE_EVENT(scoutfs_trans_acquired_hold,
 		tri_items, tri_vals),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, cnt_items)
 		__field(int, cnt_vals)
 		__field(void *, rsv)
@@ -663,7 +660,7 @@ TRACE_EVENT(scoutfs_trans_acquired_hold,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->cnt_items = cnt->items;
 		__entry->cnt_vals = cnt->vals;
 		__entry->rsv = rsv;
@@ -678,9 +675,9 @@ TRACE_EVENT(scoutfs_trans_acquired_hold,
 		__entry->tri_vals = tri_vals;
 	),
 
-	TP_printk(FSID_FMT" cnt %u.%u, rsv %p holders %u reserved %u.%u "
+	TP_printk(SCSBF" cnt %u.%u, rsv %p holders %u reserved %u.%u "
 		  "actual %d.%d, trans holders %u writing %u reserved "
-		  "%u.%u", __entry->fsid, __entry->cnt_items,
+		  "%u.%u", SCSB_TRACE_ARGS, __entry->cnt_items,
 		  __entry->cnt_vals, __entry->rsv, __entry->rsv_holders,
 		  __entry->res_items, __entry->res_vals, __entry->act_items,
 		  __entry->act_vals, __entry->tri_holders, __entry->tri_writing,
@@ -695,7 +692,7 @@ TRACE_EVENT(scoutfs_trans_track_item,
 		res_vals),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, delta_items)
 		__field(int, delta_vals)
 		__field(int, act_items)
@@ -705,7 +702,7 @@ TRACE_EVENT(scoutfs_trans_track_item,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->delta_items = delta_items;
 		__entry->delta_vals = delta_vals;
 		__entry->act_items = act_items;
@@ -714,8 +711,8 @@ TRACE_EVENT(scoutfs_trans_track_item,
 		__entry->res_vals = res_vals;
 	),
 
-	TP_printk("fsid "FSID_FMT" delta_items %d delta_vals %d act_items %d act_vals %d res_items %d res_vals %d",
-		  __entry->fsid, __entry->delta_items, __entry->delta_vals,
+	TP_printk(SCSBF" delta_items %d delta_vals %d act_items %d act_vals %d res_items %d res_vals %d",
+		  SCSB_TRACE_ARGS, __entry->delta_items, __entry->delta_vals,
 		  __entry->act_items, __entry->act_vals, __entry->res_items,
 		  __entry->res_vals)
 );
@@ -726,16 +723,16 @@ TRACE_EVENT(scoutfs_ioc_release_ret,
 	TP_ARGS(sb, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ret %d", __entry->fsid, __entry->ret)
+	TP_printk(SCSBF" ret %d", SCSB_TRACE_ARGS, __entry->ret)
 );
 
 TRACE_EVENT(scoutfs_ioc_release,
@@ -744,20 +741,20 @@ TRACE_EVENT(scoutfs_ioc_release,
 	TP_ARGS(sb, args),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, block)
 		__field(__u64, count)
 		__field(__u64, vers)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->block = args->block;
 		__entry->count = args->count;
 		__entry->vers = args->data_version;
 	),
 
-	TP_printk(FSID_FMT" block %llu count %llu vers %llu", __entry->fsid,
+	TP_printk(SCSBF" block %llu count %llu vers %llu", SCSB_TRACE_ARGS,
 		  __entry->block, __entry->count, __entry->vers)
 );
 
@@ -767,7 +764,7 @@ TRACE_EVENT(scoutfs_ioc_walk_inodes,
 	TP_ARGS(sb, walk),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, index)
 		__field(__u64, first_major)
 		__field(__u32, first_minor)
@@ -778,7 +775,7 @@ TRACE_EVENT(scoutfs_ioc_walk_inodes,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->index = walk->index;
 		__entry->first_major = walk->first.major;
 		__entry->first_minor = walk->first.minor;
@@ -788,8 +785,8 @@ TRACE_EVENT(scoutfs_ioc_walk_inodes,
 		__entry->last_ino = walk->last.ino;
 	),
 
-	TP_printk(FSID_FMT" index %u first %llu.%u.%llu last %llu.%u.%llu",
-		  __entry->fsid, __entry->index, __entry->first_major,
+	TP_printk(SCSBF" index %u first %llu.%u.%llu last %llu.%u.%llu",
+		  SCSB_TRACE_ARGS, __entry->index, __entry->first_major,
 		  __entry->first_minor, __entry->first_ino, __entry->last_major,
 		  __entry->last_minor, __entry->last_ino)
 );
@@ -818,7 +815,7 @@ DECLARE_EVENT_CLASS(scoutfs_index_item_class,
 	TP_ARGS(sb, type, major, minor, ino),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u8, type)
 		__field(__u64, major)
 		__field(__u32, minor)
@@ -826,16 +823,16 @@ DECLARE_EVENT_CLASS(scoutfs_index_item_class,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->type = type;
 		__entry->major = major;
 		__entry->minor = minor;
 		__entry->ino = ino;
 	),
 
-	TP_printk("fsid "FSID_FMT" type %u major %llu minor %u ino %llu",
-		  __entry->fsid, __entry->type, __entry->major, __entry->minor,
-		  __entry->ino)
+	TP_printk(SCSBF" type %u major %llu minor %u ino %llu",
+		  SCSB_TRACE_ARGS, __entry->type, __entry->major,
+		  __entry->minor, __entry->ino)
 );
 
 DEFINE_EVENT(scoutfs_index_item_class, scoutfs_create_index_item,
@@ -857,7 +854,7 @@ TRACE_EVENT(scoutfs_alloc_ino,
 	TP_ARGS(sb, ret, ino, next_ino, next_nr),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, ret)
 		__field(__u64, ino)
 		__field(__u64, next_ino)
@@ -865,16 +862,16 @@ TRACE_EVENT(scoutfs_alloc_ino,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ret = ret;
 		__entry->ino = ino;
 		__entry->next_ino = next_ino;
 		__entry->next_nr = next_nr;
 	),
 
-	TP_printk(FSID_FMT" ret %d ino %llu next_ino %llu next_nr %llu",
-		  __entry->fsid, __entry->ret, __entry->ino, __entry->next_ino,
-		  __entry->next_nr)
+	TP_printk(SCSBF" ret %d ino %llu next_ino %llu next_nr %llu",
+		  SCSB_TRACE_ARGS, __entry->ret, __entry->ino,
+		  __entry->next_ino, __entry->next_nr)
 );
 
 TRACE_EVENT(scoutfs_evict_inode,
@@ -884,20 +881,20 @@ TRACE_EVENT(scoutfs_evict_inode,
 	TP_ARGS(sb, ino, nlink, is_bad_ino),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(unsigned int, nlink)
 		__field(unsigned int, is_bad_ino)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->nlink = nlink;
 		__entry->is_bad_ino = is_bad_ino;
 	),
 
-	TP_printk(FSID_FMT" ino %llu nlink %u bad %d", __entry->fsid,
+	TP_printk(SCSBF" ino %llu nlink %u bad %d", SCSB_TRACE_ARGS,
 		  __entry->ino, __entry->nlink, __entry->is_bad_ino)
 );
 
@@ -908,20 +905,20 @@ TRACE_EVENT(scoutfs_drop_inode,
 	TP_ARGS(sb, ino, nlink, unhashed),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(unsigned int, nlink)
 		__field(unsigned int, unhashed)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->nlink = nlink;
 		__entry->unhashed = unhashed;
 	),
 
-	TP_printk(FSID_FMT" ino %llu nlink %u unhashed %d", __entry->fsid,
+	TP_printk(SCSBF" ino %llu nlink %u unhashed %d", SCSB_TRACE_ARGS,
 		  __entry->ino, __entry->nlink, __entry->unhashed)
 );
 
@@ -931,20 +928,20 @@ TRACE_EVENT(scoutfs_inode_walk_writeback,
 	TP_ARGS(sb, ino, write, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(int, write)
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->write = write;
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ino %llu write %d ret %d", __entry->fsid,
+	TP_printk(SCSBF" ino %llu write %d ret %d", SCSB_TRACE_ARGS,
 		  __entry->ino, __entry->write, __entry->ret)
 );
 
@@ -954,16 +951,16 @@ DECLARE_EVENT_CLASS(scoutfs_segment_class,
 	TP_ARGS(sb, segno),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, segno)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->segno = segno;
 	),
 
-	TP_printk(FSID_FMT" segno %llu", __entry->fsid, __entry->segno)
+	TP_printk(SCSBF" segno %llu", SCSB_TRACE_ARGS, __entry->segno)
 );
 
 DEFINE_EVENT(scoutfs_segment_class, scoutfs_seg_submit_read,
@@ -982,16 +979,16 @@ DECLARE_EVENT_CLASS(scoutfs_lock_info_class,
 	TP_ARGS(sb, linfo),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(struct lock_info *, linfo)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->linfo = linfo;
 	),
 
-	TP_printk(FSID_FMT" linfo %p", __entry->fsid, __entry->linfo)
+	TP_printk(SCSBF" linfo %p", SCSB_TRACE_ARGS, __entry->linfo)
 );
 
 DEFINE_EVENT(scoutfs_lock_info_class, scoutfs_lock_setup,
@@ -1016,7 +1013,7 @@ TRACE_EVENT(scoutfs_xattr_set,
 	TP_ARGS(sb, name_len, value, size, flags),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(size_t, name_len)
 		__field(const void *, value)
 		__field(size_t, size)
@@ -1024,15 +1021,15 @@ TRACE_EVENT(scoutfs_xattr_set,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->name_len = name_len;
 		__entry->value = value;
 		__entry->size = size;
 		__entry->flags = flags;
 	),
 
-	TP_printk(FSID_FMT" name_len %zu value %p size %zu flags 0x%x",
-		  __entry->fsid, __entry->name_len, __entry->value,
+	TP_printk(SCSBF" name_len %zu value %p size %zu flags 0x%x",
+		  SCSB_TRACE_ARGS, __entry->name_len, __entry->value,
 		  __entry->size, __entry->flags)
 );
 
@@ -1042,18 +1039,18 @@ TRACE_EVENT(scoutfs_manifest_next_compact,
 	TP_ARGS(sb, level, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, level)
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->level = level;
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" level %d ret %d", __entry->fsid, __entry->level,
+	TP_printk(SCSBF" level %d ret %d", SCSB_TRACE_ARGS, __entry->level,
 		  __entry->ret)
 );
 
@@ -1063,16 +1060,16 @@ TRACE_EVENT(scoutfs_advance_dirty_super,
 	TP_ARGS(sb, seq),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, seq)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->seq = seq;
 	),
 
-	TP_printk(FSID_FMT" super seq now %llu", __entry->fsid, __entry->seq)
+	TP_printk(SCSBF" super seq now %llu", SCSB_TRACE_ARGS, __entry->seq)
 );
 
 TRACE_EVENT(scoutfs_dir_add_next_linkref,
@@ -1084,7 +1081,7 @@ TRACE_EVENT(scoutfs_dir_add_next_linkref,
 		name_len),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(__u64, dir_ino)
 		__field(__u64, dir_pos)
@@ -1095,7 +1092,7 @@ TRACE_EVENT(scoutfs_dir_add_next_linkref,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->dir_ino = dir_ino;
 		__entry->dir_pos = dir_pos;
@@ -1105,8 +1102,8 @@ TRACE_EVENT(scoutfs_dir_add_next_linkref,
 		__entry->name_len = name_len;
 	),
 
-	TP_printk("fsid "FSID_FMT" ino %llu dir_ino %llu dir_pos %llu ret %d found_dir_ino %llu found_dir_pos %llu name_len %u",
-		  __entry->fsid, __entry->ino, __entry->dir_pos,
+	TP_printk(SCSBF" ino %llu dir_ino %llu dir_pos %llu ret %d found_dir_ino %llu found_dir_pos %llu name_len %u",
+		  SCSB_TRACE_ARGS, __entry->ino, __entry->dir_pos,
 		  __entry->dir_ino, __entry->ret, __entry->found_dir_pos,
 		  __entry->found_dir_ino, __entry->name_len)
 );
@@ -1117,21 +1114,21 @@ TRACE_EVENT(scoutfs_client_compact_start,
 	TP_ARGS(sb, id, last_level, flags),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, id)
 		__field(__u8, last_level)
 		__field(__u8, flags)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->id = id;
 		__entry->last_level = last_level;
 		__entry->flags = flags;
 	),
 
-	TP_printk("fsid "FSID_FMT" id %llu last_level %u flags 0x%x",
-		  __entry->fsid, __entry->id, __entry->last_level,
+	TP_printk(SCSBF" id %llu last_level %u flags 0x%x",
+		  SCSB_TRACE_ARGS, __entry->id, __entry->last_level,
 		  __entry->flags)
 );
 
@@ -1141,19 +1138,19 @@ TRACE_EVENT(scoutfs_client_compact_stop,
 	TP_ARGS(sb, id, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, id)
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->id = id;
 		__entry->ret = ret;
 	),
 
-	TP_printk("fsid "FSID_FMT" id %llu ret %d",
-		  __entry->fsid, __entry->id, __entry->ret)
+	TP_printk(SCSBF" id %llu ret %d",
+		  SCSB_TRACE_ARGS, __entry->id, __entry->ret)
 );
 
 TRACE_EVENT(scoutfs_server_compact_start,
@@ -1164,7 +1161,7 @@ TRACE_EVENT(scoutfs_server_compact_start,
 	TP_ARGS(sb, id, level, node_id, client_nr, server_nr, per_client),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, id)
 		__field(__u8, level)
 		__field(__u64, node_id)
@@ -1174,7 +1171,7 @@ TRACE_EVENT(scoutfs_server_compact_start,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->id = id;
 		__entry->level = level;
 		__entry->node_id = node_id;
@@ -1183,9 +1180,10 @@ TRACE_EVENT(scoutfs_server_compact_start,
 		__entry->per_client = per_client;
 	),
 
-	TP_printk("fsid "FSID_FMT" id %llu level %u node_id %llu client_nr %lu server_nr %lu per_client %lu",
-		  __entry->fsid, __entry->id, __entry->level, __entry->node_id,
-		  __entry->client_nr, __entry->server_nr, __entry->per_client)
+	TP_printk(SCSBF" id %llu level %u node_id %llu client_nr %lu server_nr %lu per_client %lu",
+		  SCSB_TRACE_ARGS, __entry->id, __entry->level,
+		  __entry->node_id, __entry->client_nr, __entry->server_nr,
+		  __entry->per_client)
 );
 
 TRACE_EVENT(scoutfs_server_compact_done,
@@ -1195,21 +1193,21 @@ TRACE_EVENT(scoutfs_server_compact_done,
 	TP_ARGS(sb, id, node_id, server_nr),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, id)
 		__field(__u64, node_id)
 		__field(unsigned long, server_nr)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->id = id;
 		__entry->node_id = node_id;
 		__entry->server_nr = server_nr;
 	),
 
-	TP_printk("fsid "FSID_FMT" id %llu node_id %llu server_nr %lu",
-		  __entry->fsid, __entry->id, __entry->node_id,
+	TP_printk(SCSBF" id %llu node_id %llu server_nr %lu",
+		  SCSB_TRACE_ARGS, __entry->id, __entry->node_id,
 		  __entry->server_nr)
 );
 
@@ -1219,19 +1217,19 @@ TRACE_EVENT(scoutfs_server_compact_response,
 	TP_ARGS(sb, id, error),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, id)
 		__field(int, error)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->id = id;
 		__entry->error = error;
 	),
 
-	TP_printk("fsid "FSID_FMT" id %llu error %d",
-		  __entry->fsid, __entry->id, __entry->error)
+	TP_printk(SCSBF" id %llu error %d",
+		  SCSB_TRACE_ARGS, __entry->id, __entry->error)
 );
 
 TRACE_EVENT(scoutfs_write_begin,
@@ -1240,20 +1238,20 @@ TRACE_EVENT(scoutfs_write_begin,
 	TP_ARGS(sb, ino, pos, len),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, inode)
 		__field(__u64, pos)
 		__field(__u32, len)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->inode = ino;
 		__entry->pos = pos;
 		__entry->len = len;
 	),
 
-	TP_printk(FSID_FMT" ino %llu pos %llu len %u", __entry->fsid,
+	TP_printk(SCSBF" ino %llu pos %llu len %u", SCSB_TRACE_ARGS,
 		  __entry->inode, __entry->pos, __entry->len)
 );
 
@@ -1264,7 +1262,7 @@ TRACE_EVENT(scoutfs_write_end,
 	TP_ARGS(sb, ino, idx, pos, len, copied),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(unsigned long, idx)
 		__field(__u64, pos)
@@ -1273,7 +1271,7 @@ TRACE_EVENT(scoutfs_write_end,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = ino;
 		__entry->idx = idx;
 		__entry->pos = pos;
@@ -1281,8 +1279,8 @@ TRACE_EVENT(scoutfs_write_end,
 		__entry->copied = copied;
 	),
 
-	TP_printk(FSID_FMT" ino %llu pgind %lu pos %llu len %u copied %d",
-		  __entry->fsid, __entry->ino, __entry->idx, __entry->pos,
+	TP_printk(SCSBF" ino %llu pgind %lu pos %llu len %u copied %d",
+		  SCSB_TRACE_ARGS, __entry->ino, __entry->idx, __entry->pos,
 		  __entry->len, __entry->copied)
 );
 
@@ -1445,7 +1443,7 @@ TRACE_EVENT(scoutfs_read_item_keys,
 		 struct scoutfs_key *seg_end),
         TP_ARGS(sb, key, start, end, seg_start, seg_end),
         TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		sk_trace_define(key)
 		sk_trace_define(start)
 		sk_trace_define(end)
@@ -1453,15 +1451,15 @@ TRACE_EVENT(scoutfs_read_item_keys,
 		sk_trace_define(seg_end)
         ),
         TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		sk_trace_assign(key, key);
 		sk_trace_assign(start, start);
 		sk_trace_assign(end, end);
 		sk_trace_assign(seg_start, seg_start);
 		sk_trace_assign(seg_end, seg_end);
         ),
-        TP_printk("fsid "FSID_FMT" key "SK_FMT" start "SK_FMT" end "SK_FMT" seg_start "SK_FMT" seg_end "SK_FMT"",
-		  __entry->fsid, sk_trace_args(key), sk_trace_args(start),
+        TP_printk(SCSBF" key "SK_FMT" start "SK_FMT" end "SK_FMT" seg_start "SK_FMT" seg_end "SK_FMT"",
+		  SCSB_TRACE_ARGS, sk_trace_args(key), sk_trace_args(start),
 		  sk_trace_args(end), sk_trace_args(seg_start),
 		  sk_trace_args(seg_end))
 );
@@ -1470,14 +1468,14 @@ DECLARE_EVENT_CLASS(scoutfs_key_class,
         TP_PROTO(struct super_block *sb, struct scoutfs_key *key),
         TP_ARGS(sb, key),
         TP_STRUCT__entry(
- 		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		sk_trace_define(key)
         ),
         TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		sk_trace_assign(key, key);
         ),
-	TP_printk(FSID_FMT" key "SK_FMT, __entry->fsid, sk_trace_args(key))
+	TP_printk(SCSBF" key "SK_FMT, SCSB_TRACE_ARGS, sk_trace_args(key))
 );
 
 DEFINE_EVENT(scoutfs_key_class, scoutfs_item_lookup,
@@ -1491,16 +1489,16 @@ TRACE_EVENT(scoutfs_item_lookup_ret,
 	TP_ARGS(sb, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, ret)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ret = ret;
 	),
 
-	TP_printk(FSID_FMT" ret %d", __entry->fsid, __entry->ret)
+	TP_printk(SCSBF" ret %d", SCSB_TRACE_ARGS, __entry->ret)
 );
 
 DEFINE_EVENT(scoutfs_key_class, scoutfs_item_insertion,
@@ -1523,17 +1521,17 @@ DECLARE_EVENT_CLASS(scoutfs_range_class,
 		 struct scoutfs_key *end),
         TP_ARGS(sb, start, end),
         TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		sk_trace_define(start)
 		sk_trace_define(end)
         ),
         TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		sk_trace_assign(start, start);
 		sk_trace_assign(end, end);
         ),
-        TP_printk("fsid "FSID_FMT" start "SK_FMT" end "SK_FMT,
-		  __entry->fsid, sk_trace_args(start), sk_trace_args(end))
+        TP_printk(SCSBF" start "SK_FMT" end "SK_FMT,
+		  SCSB_TRACE_ARGS, sk_trace_args(start), sk_trace_args(end))
 );
 
 DEFINE_EVENT(scoutfs_range_class, scoutfs_item_insert_batch,
@@ -1553,19 +1551,19 @@ DECLARE_EVENT_CLASS(scoutfs_cached_range_class,
 		 struct scoutfs_key *start, struct scoutfs_key *end),
         TP_ARGS(sb, rng, start, end),
         TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(void *, rng)
 		sk_trace_define(start)
 		sk_trace_define(end)
         ),
         TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->rng = rng;
 		sk_trace_assign(start, start);
 		sk_trace_assign(end, end);
         ),
-        TP_printk("fsid "FSID_FMT" rng %p start "SK_FMT" end "SK_FMT,
-		  __entry->fsid, __entry->rng, sk_trace_args(start),
+        TP_printk(SCSBF" rng %p start "SK_FMT" end "SK_FMT,
+		  SCSB_TRACE_ARGS, __entry->rng, sk_trace_args(start),
 		  sk_trace_args(end))
 );
 
@@ -1628,7 +1626,7 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class,
         TP_PROTO(struct super_block *sb, struct scoutfs_lock *lck),
         TP_ARGS(sb, lck),
         TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		sk_trace_define(start)
 		sk_trace_define(end)
 		__field(u64, refresh_gen)
@@ -1643,7 +1641,7 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class,
 		__field(unsigned int, users_ex)
 	),
         TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		sk_trace_assign(start, &lck->start);
 		sk_trace_assign(end, &lck->end);
 		__entry->refresh_gen = lck->refresh_gen;
@@ -1657,8 +1655,8 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class,
 		__entry->users_ex = lck->users[SCOUTFS_LOCK_WRITE];
 		__entry->users_cw = lck->users[SCOUTFS_LOCK_WRITE_ONLY];
         ),
-        TP_printk("fsid "FSID_FMT" start "SK_FMT" end "SK_FMT" mode %u reqpnd %u invpnd %u rfrgen %llu waiters: pr %u ex %u cw %u users: pr %u ex %u cw %u",
-		  __entry->fsid, sk_trace_args(start), sk_trace_args(end),
+        TP_printk(SCSBF" start "SK_FMT" end "SK_FMT" mode %u reqpnd %u invpnd %u rfrgen %llu waiters: pr %u ex %u cw %u users: pr %u ex %u cw %u",
+		  SCSB_TRACE_ARGS, sk_trace_args(start), sk_trace_args(end),
 		  __entry->mode, __entry->request_pending,
 		  __entry->invalidate_pending, __entry->refresh_gen,
 		  __entry->waiters_pr, __entry->waiters_ex, __entry->waiters_cw,
@@ -1757,7 +1755,7 @@ TRACE_EVENT(scoutfs_seg_append_item,
 	TP_ARGS(sb, segno, seq, nr_items, total_bytes, key, val_len),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, segno)
 		__field(__u64, seq)
 		__field(__u32, nr_items)
@@ -1767,7 +1765,7 @@ TRACE_EVENT(scoutfs_seg_append_item,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->segno = segno;
 		__entry->seq = seq;
 		__entry->nr_items = nr_items;
@@ -1776,8 +1774,8 @@ TRACE_EVENT(scoutfs_seg_append_item,
 		__entry->val_len = val_len;
 	),
 
-	TP_printk("fsid "FSID_FMT" segno %llu seq %llu nr_items %u total_bytes %u key "SK_FMT" val_len %u",
-		  __entry->fsid, __entry->segno, __entry->seq,
+	TP_printk(SCSBF" segno %llu seq %llu nr_items %u total_bytes %u key "SK_FMT" val_len %u",
+		  SCSB_TRACE_ARGS, __entry->segno, __entry->seq,
 		  __entry->nr_items, __entry->total_bytes,
 		  sk_trace_args(key), __entry->val_len)
 );
@@ -1787,19 +1785,19 @@ DECLARE_EVENT_CLASS(scoutfs_net_class,
 		 struct sockaddr_in *peer, struct scoutfs_net_header *nh),
         TP_ARGS(sb, name, peer, nh),
         TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		si4_trace_define(name)
 		si4_trace_define(peer)
 		snh_trace_define(nh)
         ),
         TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		si4_trace_assign(name, name);
 		si4_trace_assign(peer, peer);
 		snh_trace_assign(nh, nh);
         ),
-        TP_printk("fsid "FSID_FMT" name "SI4_FMT" peer "SI4_FMT" nh "SNH_FMT,
-		  __entry->fsid, si4_trace_args(name), si4_trace_args(peer),
+        TP_printk(SCSBF" name "SI4_FMT" peer "SI4_FMT" nh "SNH_FMT,
+		  SCSB_TRACE_ARGS, si4_trace_args(name), si4_trace_args(peer),
 		  snh_trace_args(nh))
 );
 
@@ -1819,17 +1817,17 @@ DECLARE_EVENT_CLASS(scoutfs_work_class,
         TP_PROTO(struct super_block *sb, u64 data, int ret),
         TP_ARGS(sb, data, ret),
         TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, data)
 		__field(int, ret)
         ),
         TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->data = data;
 		__entry->ret = ret;
         ),
-	TP_printk("fsid "FSID_FMT" data %llu ret %d",
-		  __entry->fsid, __entry->data, __entry->ret)
+	TP_printk(SCSBF" data %llu ret %d",
+		  SCSB_TRACE_ARGS, __entry->data, __entry->ret)
 );
 DEFINE_EVENT(scoutfs_work_class, scoutfs_server_commit_work_enter,
         TP_PROTO(struct super_block *sb, u64 data, int ret),
@@ -2058,7 +2056,7 @@ TRACE_EVENT(scoutfs_rename,
 	TP_ARGS(sb, old_dir, old_dentry, new_dir, new_dentry),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, old_dir_ino)
 		__string(old_name, old_dentry->d_name.name)
 		__field(__u64, new_dir_ino)
@@ -2067,7 +2065,7 @@ TRACE_EVENT(scoutfs_rename,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->old_dir_ino = scoutfs_ino(old_dir);
 		__assign_str(old_name, old_dentry->d_name.name)
 		__entry->new_dir_ino = scoutfs_ino(new_dir);
@@ -2076,8 +2074,8 @@ TRACE_EVENT(scoutfs_rename,
 					 scoutfs_ino(new_dentry->d_inode) : 0;
 	),
 
-	TP_printk("fsid "FSID_FMT" old_dir_ino %llu old_name %s new_dir_ino %llu new_name %s new_inode_ino %llu",
-		  __entry->fsid, __entry->old_dir_ino, __get_str(old_name),
+	TP_printk(SCSBF" old_dir_ino %llu old_name %s new_dir_ino %llu new_name %s new_inode_ino %llu",
+		  SCSB_TRACE_ARGS, __entry->old_dir_ino, __get_str(old_name),
 		  __entry->new_dir_ino, __get_str(new_name),
 		  __entry->new_inode_ino)
 );
@@ -2090,7 +2088,7 @@ TRACE_EVENT(scoutfs_d_revalidate,
 	TP_ARGS(sb, dentry, flags, parent, is_covered, ret),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__string(name, dentry->d_name.name)
 		__field(__u64, ino)
 		__field(__u64, parent_ino)
@@ -2101,7 +2099,7 @@ TRACE_EVENT(scoutfs_d_revalidate,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__assign_str(name, dentry->d_name.name)
 		__entry->ino = dentry->d_inode ?
 			       scoutfs_ino(dentry->d_inode) : 0;
@@ -2113,8 +2111,8 @@ TRACE_EVENT(scoutfs_d_revalidate,
 		__entry->ret = ret;
 	),
 
-	TP_printk("fsid "FSID_FMT" name %s ino %llu parent_ino %llu flags 0x%x s_root %u is_covered %u ret %d",
-		  __entry->fsid, __get_str(name), __entry->ino,
+	TP_printk(SCSBF" name %s ino %llu parent_ino %llu flags 0x%x s_root %u is_covered %u ret %d",
+		  SCSB_TRACE_ARGS, __get_str(name), __entry->ino,
 		  __entry->parent_ino, __entry->flags,
 		  __entry->is_root,
 		  __entry->is_covered,
@@ -2125,19 +2123,19 @@ DECLARE_EVENT_CLASS(scoutfs_super_lifecycle_class,
         TP_PROTO(struct super_block *sb),
         TP_ARGS(sb),
         TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(void *, sb)
 		__field(void *, sbi)
 		__field(void *, s_root)
         ),
         TP_fast_assign(
-		__entry->fsid = SCOUTFS_SB(sb) ? FSID_ARG(sb) : 0;
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->sb = sb;
 		__entry->sbi = SCOUTFS_SB(sb);
 		__entry->s_root = sb->s_root;
         ),
-	TP_printk("fsid "FSID_FMT" sb %p sbi %p s_root %p",
-		  __entry->fsid, __entry->sb, __entry->sbi, __entry->s_root)
+	TP_printk(SCSBF" sb %p sbi %p s_root %p",
+		  SCSB_TRACE_ARGS, __entry->sb, __entry->sbi, __entry->s_root)
 );
 
 DEFINE_EVENT(scoutfs_super_lifecycle_class, scoutfs_fill_super,
@@ -2159,20 +2157,20 @@ DECLARE_EVENT_CLASS(scoutfs_fileid_class,
 	TP_PROTO(struct super_block *sb, int fh_type, struct scoutfs_fid *fid),
 	TP_ARGS(sb, fh_type, fid),
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, fh_type)
 		__field(u64, ino)
 		__field(u64, parent_ino)
 	),
 	TP_fast_assign(
-		__entry->fsid = SCOUTFS_SB(sb) ? FSID_ARG(sb) : 0;
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->fh_type = fh_type;
 		__entry->ino = le64_to_cpu(fid->ino);
 		__entry->parent_ino = fh_type == FILEID_SCOUTFS_WITH_PARENT ?
 				le64_to_cpu(fid->parent_ino) : 0ULL;
 	),
-	TP_printk("fsid "FSID_FMT" type %d ino %llu parent %llu",
-		  __entry->fsid, __entry->fh_type, __entry->ino,
+	TP_printk(SCSBF" type %d ino %llu parent %llu",
+		  SCSB_TRACE_ARGS, __entry->fh_type, __entry->ino,
 		  __entry->parent_ino)
 );
 
@@ -2197,19 +2195,19 @@ TRACE_EVENT(scoutfs_get_parent,
 	TP_ARGS(sb, inode, parent),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, ino)
 		__field(__u64, parent)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = SCOUTFS_SB(sb) ? FSID_ARG(sb) : 0;
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->ino = scoutfs_ino(inode);
 		__entry->parent = parent;
 	),
 
-	TP_printk("fsid "FSID_FMT" child %llu parent %llu",
-		  __entry->fsid, __entry->ino, __entry->parent)
+	TP_printk(SCSBF" child %llu parent %llu",
+		  SCSB_TRACE_ARGS, __entry->ino, __entry->parent)
 );
 
 TRACE_EVENT(scoutfs_get_name,
@@ -2219,21 +2217,21 @@ TRACE_EVENT(scoutfs_get_name,
 	TP_ARGS(sb, parent, child, name),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, parent_ino)
 		__field(__u64, child_ino)
 		__string(name, name)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = SCOUTFS_SB(sb) ? FSID_ARG(sb) : 0;
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->parent_ino = scoutfs_ino(parent);
 		__entry->child_ino = scoutfs_ino(child);
 		__assign_str(name, name);
 	),
 
-	TP_printk("fsid "FSID_FMT" parent %llu child %llu name: %s",
-		  __entry->fsid, __entry->parent_ino, __entry->child_ino,
+	TP_printk(SCSBF" parent %llu child %llu name: %s",
+		  SCSB_TRACE_ARGS, __entry->parent_ino, __entry->child_ino,
 		  __get_str(name))
 );
 
@@ -2243,19 +2241,19 @@ TRACE_EVENT(scoutfs_btree_read_error,
 	TP_ARGS(sb, ref),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, blkno)
 		__field(__u64, seq)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->blkno = le64_to_cpu(ref->blkno);
 		__entry->seq = le64_to_cpu(ref->seq);
 	),
 
-	TP_printk("fsid "FSID_FMT" blkno %llu seq %llu",
-		  __entry->fsid, __entry->blkno, __entry->seq)
+	TP_printk(SCSBF" blkno %llu seq %llu",
+		  SCSB_TRACE_ARGS, __entry->blkno, __entry->seq)
 );
 
 TRACE_EVENT(scoutfs_btree_dirty_block,
@@ -2267,7 +2265,7 @@ TRACE_EVENT(scoutfs_btree_dirty_block,
 		bt_blkno, bt_seq),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, blkno)
 		__field(__u64, seq)
 		__field(__u64, next_block)
@@ -2279,7 +2277,7 @@ TRACE_EVENT(scoutfs_btree_dirty_block,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->blkno = blkno;
 		__entry->seq = seq;
 		__entry->next_block = next_block;
@@ -2290,8 +2288,8 @@ TRACE_EVENT(scoutfs_btree_dirty_block,
 		__entry->bt_seq = bt_seq;
 	),
 
-	TP_printk("fsid "FSID_FMT" blkno %llu seq %llu next_block %llu next_seq %llu cur_dirtied %lu old_dirtied %lu bt_blkno %llu bt_seq %llu",
-		  __entry->fsid, __entry->blkno, __entry->seq,
+	TP_printk(SCSBF" blkno %llu seq %llu next_block %llu next_seq %llu cur_dirtied %lu old_dirtied %lu bt_blkno %llu bt_seq %llu",
+		  SCSB_TRACE_ARGS, __entry->blkno, __entry->seq,
 		  __entry->next_block, __entry->next_seq, __entry->cur_dirtied,
 		  __entry->old_dirtied, __entry->bt_blkno, __entry->bt_seq)
 );
@@ -2302,17 +2300,17 @@ DECLARE_EVENT_CLASS(scoutfs_extent_class,
 	TP_ARGS(sb, ext),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		se_trace_define(ext)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = SCOUTFS_SB(sb) ? FSID_ARG(sb) : 0;
+		SCSB_TRACE_ASSIGN(sb);
 		se_trace_assign(ext, ext);
 	),
 
-	TP_printk("fsid "FSID_FMT" ext "SE_FMT,
-		  __entry->fsid, se_trace_args(ext))
+	TP_printk(SCSBF" ext "SE_FMT,
+		  SCSB_TRACE_ARGS, se_trace_args(ext))
 );
 
 DEFINE_EVENT(scoutfs_extent_class, scoutfs_extent_insert,
@@ -2420,7 +2418,7 @@ TRACE_EVENT(scoutfs_online_offline_blocks,
 	TP_ARGS(inode, on_delta, off_delta, on_now, off_now),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__s64, on_delta)
 		__field(__s64, off_delta)
 		__field(__u64, on_now)
@@ -2428,15 +2426,15 @@ TRACE_EVENT(scoutfs_online_offline_blocks,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(inode->i_sb);
+		SCSB_TRACE_ASSIGN(inode->i_sb);
 		__entry->on_delta = on_delta;
 		__entry->off_delta = off_delta;
 		__entry->on_now = on_now;
 		__entry->off_now = off_now;
 	),
 
-	TP_printk("fsid "FSID_FMT" on_delta %lld off_delta %lld on_now %llu off_now %llu ",
-		  __entry->fsid, __entry->on_delta, __entry->off_delta,
+	TP_printk(SCSBF" on_delta %lld off_delta %lld on_now %llu off_now %llu ",
+		  SCSB_TRACE_ARGS, __entry->on_delta, __entry->off_delta,
 		  __entry->on_now, __entry->off_now)
 );
 
@@ -2446,17 +2444,17 @@ DECLARE_EVENT_CLASS(scoutfs_segno_class,
 	TP_ARGS(sb, segno),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__s64, segno)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->segno = segno;
 	),
 
-	TP_printk("fsid "FSID_FMT" segno %llu",
-		  __entry->fsid, __entry->segno)
+	TP_printk(SCSBF" segno %llu",
+		  SCSB_TRACE_ARGS, __entry->segno)
 );
 DEFINE_EVENT(scoutfs_segno_class, scoutfs_alloc_segno,
 	TP_PROTO(struct super_block *sb, u64 segno),
@@ -2477,19 +2475,19 @@ DECLARE_EVENT_CLASS(scoutfs_server_client_count_class,
 	TP_ARGS(sb, node_id, nr_clients),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__s64, node_id)
 		__field(unsigned long, nr_clients)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->node_id = node_id;
 		__entry->nr_clients = nr_clients;
 	),
 
-	TP_printk("fsid "FSID_FMT" node_id %llu nr_clients %lu",
-		  __entry->fsid, __entry->node_id, __entry->nr_clients)
+	TP_printk(SCSBF" node_id %llu nr_clients %lu",
+		  SCSB_TRACE_ARGS, __entry->node_id, __entry->nr_clients)
 );
 DEFINE_EVENT(scoutfs_server_client_count_class, scoutfs_server_client_up,
 	TP_PROTO(struct super_block *sb, u64 node_id, unsigned long nr_clients),
@@ -2516,7 +2514,7 @@ TRACE_EVENT(scoutfs_lock_message,
 	TP_ARGS(sb, who, what, dir, node_id, net_id, nl),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(int, who)
 		__field(int, what)
 		__field(int, dir)
@@ -2528,7 +2526,7 @@ TRACE_EVENT(scoutfs_lock_message,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->who = who;
 		__entry->what = what;
 		__entry->dir = dir;
@@ -2539,8 +2537,8 @@ TRACE_EVENT(scoutfs_lock_message,
 		__entry->new_mode = nl->new_mode;
 	),
 
-	TP_printk("fsid "FSID_FMT" %s %s %s node_id %llu net_id %llu key "SK_FMT" old_mode %u new_mode %u",
-		  __entry->fsid, slt_symbolic(__entry->who),
+	TP_printk(SCSBF" %s %s %s node_id %llu net_id %llu key "SK_FMT" old_mode %u new_mode %u",
+		  SCSB_TRACE_ARGS, slt_symbolic(__entry->who),
 		  slt_symbolic(__entry->what), slt_symbolic(__entry->dir),
 		  __entry->node_id, __entry->net_id, sk_trace_args(key),
 		  __entry->old_mode, __entry->new_mode)
@@ -2553,7 +2551,7 @@ DECLARE_EVENT_CLASS(scoutfs_quorum_block_class,
 	TP_ARGS(sb, io_blkno, blk),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, io_blkno)
 		__field(__u64, hdr_blkno)
 		__field(__u64, config_gen)
@@ -2566,7 +2564,7 @@ DECLARE_EVENT_CLASS(scoutfs_quorum_block_class,
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->io_blkno = io_blkno;
 		__entry->hdr_blkno = le64_to_cpu(blk->blkno);
 		__entry->config_gen = le64_to_cpu(blk->config_gen);
@@ -2578,8 +2576,8 @@ DECLARE_EVENT_CLASS(scoutfs_quorum_block_class,
 		__entry->flags = blk->flags;
 	),
 
-	TP_printk("fsid "FSID_FMT" io_blkno %llu hdr_blkno %llu config_gen %llu write_nr %llu elected_nr %llu umb %llu crc 0x%08x vote_slot %u flags %02x",
-		  __entry->fsid, __entry->io_blkno, __entry->hdr_blkno,
+	TP_printk(SCSBF" io_blkno %llu hdr_blkno %llu config_gen %llu write_nr %llu elected_nr %llu umb %llu crc 0x%08x vote_slot %u flags %02x",
+		  SCSB_TRACE_ARGS, __entry->io_blkno, __entry->hdr_blkno,
 		  __entry->config_gen, __entry->write_nr, __entry->elected_nr,
 		  __entry->unmount_barrier, __entry->crc, __entry->vote_slot,
 		  __entry->flags)
@@ -2628,21 +2626,21 @@ TRACE_EVENT(scoutfs_trans_seq_advance,
 	TP_ARGS(sb, node_id, prev_seq, next_seq),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, node_id)
 		__field(__u64, prev_seq)
 		__field(__u64, next_seq)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->node_id = node_id;
 		__entry->prev_seq = prev_seq;
 		__entry->next_seq = next_seq;
 	),
 
-	TP_printk("fsid "FSID_FMT" node_id %llu prev_seq %llu next_seq %llu",
-		  __entry->fsid, __entry->node_id, __entry->prev_seq,
+	TP_printk(SCSBF" node_id %llu prev_seq %llu next_seq %llu",
+		  SCSB_TRACE_ARGS, __entry->node_id, __entry->prev_seq,
 		  __entry->next_seq)
 );
 
@@ -2652,19 +2650,19 @@ TRACE_EVENT(scoutfs_trans_seq_farewell,
 	TP_ARGS(sb, node_id, trans_seq),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, node_id)
 		__field(__u64, trans_seq)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->node_id = node_id;
 		__entry->trans_seq = trans_seq;
 	),
 
-	TP_printk("fsid "FSID_FMT" node_id %llu trans_seq %llu",
-		  __entry->fsid, __entry->node_id, __entry->trans_seq)
+	TP_printk(SCSBF" node_id %llu trans_seq %llu",
+		  SCSB_TRACE_ARGS, __entry->node_id, __entry->trans_seq)
 );
 
 TRACE_EVENT(scoutfs_trans_seq_last,
@@ -2673,19 +2671,19 @@ TRACE_EVENT(scoutfs_trans_seq_last,
 	TP_ARGS(sb, node_id, trans_seq),
 
 	TP_STRUCT__entry(
-		__field(__u64, fsid)
+		SCSB_TRACE_FIELDS
 		__field(__u64, node_id)
 		__field(__u64, trans_seq)
 	),
 
 	TP_fast_assign(
-		__entry->fsid = FSID_ARG(sb);
+		SCSB_TRACE_ASSIGN(sb);
 		__entry->node_id = node_id;
 		__entry->trans_seq = trans_seq;
 	),
 
-	TP_printk("fsid "FSID_FMT" node_id %llu trans_seq %llu",
-		  __entry->fsid, __entry->node_id, __entry->trans_seq)
+	TP_printk(SCSBF" node_id %llu trans_seq %llu",
+		  SCSB_TRACE_ARGS, __entry->node_id, __entry->trans_seq)
 );
 
 #endif /* _TRACE_SCOUTFS_H */