lib9p_idl: Clean up struct stat and numeric user IDs

1 files changed, 219 insertions, 219 deletions

diff --git a/lib9p/core_generated.c b/lib9p/core_generated.c
index 1789bdc..393e8c0 100644
--- a/lib9p/core_generated.c
+++ b/lib9p/core_generated.c
@@ -352,14 +352,14 @@ static const lib9p_lock_flags_t lock_flags_masks[LIB9P_VER_NUM] = {
 static ssize_t validate_stat(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes, uint32_t *ret_net_size) {
 	uint32_t net_offset = 0;
 	ssize_t host_size = sizeof(struct lib9p_stat);
-	uint32_t offsetof_stat_size = net_offset + 0;
-	uint32_t offsetof_kern_type = net_offset + 2;
-	uint32_t offsetof_file_qid_type = net_offset + 8;
+	uint32_t offsetof__stat_size = net_offset + 0;
+	uint32_t offsetof_fstype = net_offset + 2;
+	uint32_t offsetof_qid_type = net_offset + 8;
 	VALIDATE_NET_BYTES(21);
-	if (GET_U8LE(offsetof_file_qid_type) & ~qt_masks[ctx->version])
+	if (GET_U8LE(offsetof_qid_type) & ~qt_masks[ctx->version])
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "unknown bits in qt bitfield: %#02"PRIx8,
-			GET_U8LE(offsetof_file_qid_type) & ~qt_masks[ctx->version]);
-	uint32_t offsetof_file_mode = net_offset + 0;
+			GET_U8LE(offsetof_qid_type) & ~qt_masks[ctx->version]);
+	uint32_t offsetof_mode = net_offset + 0;
 	VALIDATE_NET_BYTES(22);
 	VALIDATE_NET_UTF8(LAST_U16LE());
 	VALIDATE_NET_BYTES(2);
@@ -376,12 +376,12 @@ static ssize_t validate_stat(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	uint32_t offsetof_end = net_offset + 0;
-	if ((uint32_t)GET_U32LE(offsetof_stat_size) != (uint32_t)(offsetof_end - offsetof_kern_type))
-		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "stat->stat_size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
-			(uint32_t)GET_U32LE(offsetof_stat_size), (uint32_t)(offsetof_end - offsetof_kern_type));
-	if (GET_U32LE(offsetof_file_mode) & ~dm_masks[ctx->version])
+	if ((uint32_t)GET_U32LE(offsetof__stat_size) != (uint32_t)(offsetof_end - offsetof_fstype))
+		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "stat->_stat_size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
+			(uint32_t)GET_U32LE(offsetof__stat_size), (uint32_t)(offsetof_end - offsetof_fstype));
+	if (GET_U32LE(offsetof_mode) & ~dm_masks[ctx->version])
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "unknown bits in dm bitfield: %#08"PRIx32,
-			GET_U32LE(offsetof_file_mode) & ~dm_masks[ctx->version]);
+			GET_U32LE(offsetof_mode) & ~dm_masks[ctx->version]);
 	if (ret_net_size)
 		*ret_net_size = net_offset;
 	return (ssize_t)host_size;
@@ -893,14 +893,14 @@ static ssize_t validate_Rstat(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t
 	uint32_t offsetof_typ = net_offset + 4;
 	uint32_t offsetof_nstat = net_offset + 7;
 	uint32_t offsetof_stat = net_offset + 9;
-	uint32_t offsetof_stat_stat_size = net_offset + 9;
-	uint32_t offsetof_stat_kern_type = net_offset + 11;
-	uint32_t offsetof_stat_file_qid_type = net_offset + 17;
+	uint32_t offsetof_stat__stat_size = net_offset + 9;
+	uint32_t offsetof_stat_fstype = net_offset + 11;
+	uint32_t offsetof_stat_qid_type = net_offset + 17;
 	VALIDATE_NET_BYTES(30);
-	if (GET_U8LE(offsetof_stat_file_qid_type) & ~qt_masks[ctx->version])
+	if (GET_U8LE(offsetof_stat_qid_type) & ~qt_masks[ctx->version])
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "unknown bits in qt bitfield: %#02"PRIx8,
-			GET_U8LE(offsetof_stat_file_qid_type) & ~qt_masks[ctx->version]);
-	uint32_t offsetof_stat_file_mode = net_offset + 0;
+			GET_U8LE(offsetof_stat_qid_type) & ~qt_masks[ctx->version]);
+	uint32_t offsetof_stat_mode = net_offset + 0;
 	VALIDATE_NET_BYTES(22);
 	VALIDATE_NET_UTF8(LAST_U16LE());
 	VALIDATE_NET_BYTES(2);
@@ -917,12 +917,12 @@ static ssize_t validate_Rstat(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	uint32_t offsetof_stat_end = net_offset + 0;
-	if ((uint32_t)GET_U32LE(offsetof_stat_stat_size) != (uint32_t)(offsetof_stat_end - offsetof_stat_kern_type))
-		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "Rstat->stat.stat_size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
-			(uint32_t)GET_U32LE(offsetof_stat_stat_size), (uint32_t)(offsetof_stat_end - offsetof_stat_kern_type));
-	if (GET_U32LE(offsetof_stat_file_mode) & ~dm_masks[ctx->version])
+	if ((uint32_t)GET_U32LE(offsetof_stat__stat_size) != (uint32_t)(offsetof_stat_end - offsetof_stat_fstype))
+		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "Rstat->stat._stat_size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
+			(uint32_t)GET_U32LE(offsetof_stat__stat_size), (uint32_t)(offsetof_stat_end - offsetof_stat_fstype));
+	if (GET_U32LE(offsetof_stat_mode) & ~dm_masks[ctx->version])
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "unknown bits in dm bitfield: %#08"PRIx32,
-			GET_U32LE(offsetof_stat_file_mode) & ~dm_masks[ctx->version]);
+			GET_U32LE(offsetof_stat_mode) & ~dm_masks[ctx->version]);
 	uint32_t offsetof_end = net_offset + 0;
 	if ((uint32_t)GET_U32LE(offsetof_size) != (uint32_t)(offsetof_end - offsetof_size))
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "Rstat->size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
@@ -943,14 +943,14 @@ static ssize_t validate_Twstat(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t
 	uint32_t offsetof_typ = net_offset + 4;
 	uint32_t offsetof_nstat = net_offset + 11;
 	uint32_t offsetof_stat = net_offset + 13;
-	uint32_t offsetof_stat_stat_size = net_offset + 13;
-	uint32_t offsetof_stat_kern_type = net_offset + 15;
-	uint32_t offsetof_stat_file_qid_type = net_offset + 21;
+	uint32_t offsetof_stat__stat_size = net_offset + 13;
+	uint32_t offsetof_stat_fstype = net_offset + 15;
+	uint32_t offsetof_stat_qid_type = net_offset + 21;
 	VALIDATE_NET_BYTES(34);
-	if (GET_U8LE(offsetof_stat_file_qid_type) & ~qt_masks[ctx->version])
+	if (GET_U8LE(offsetof_stat_qid_type) & ~qt_masks[ctx->version])
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "unknown bits in qt bitfield: %#02"PRIx8,
-			GET_U8LE(offsetof_stat_file_qid_type) & ~qt_masks[ctx->version]);
-	uint32_t offsetof_stat_file_mode = net_offset + 0;
+			GET_U8LE(offsetof_stat_qid_type) & ~qt_masks[ctx->version]);
+	uint32_t offsetof_stat_mode = net_offset + 0;
 	VALIDATE_NET_BYTES(22);
 	VALIDATE_NET_UTF8(LAST_U16LE());
 	VALIDATE_NET_BYTES(2);
@@ -967,12 +967,12 @@ static ssize_t validate_Twstat(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	uint32_t offsetof_stat_end = net_offset + 0;
-	if ((uint32_t)GET_U32LE(offsetof_stat_stat_size) != (uint32_t)(offsetof_stat_end - offsetof_stat_kern_type))
-		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "Twstat->stat.stat_size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
-			(uint32_t)GET_U32LE(offsetof_stat_stat_size), (uint32_t)(offsetof_stat_end - offsetof_stat_kern_type));
-	if (GET_U32LE(offsetof_stat_file_mode) & ~dm_masks[ctx->version])
+	if ((uint32_t)GET_U32LE(offsetof_stat__stat_size) != (uint32_t)(offsetof_stat_end - offsetof_stat_fstype))
+		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "Twstat->stat._stat_size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
+			(uint32_t)GET_U32LE(offsetof_stat__stat_size), (uint32_t)(offsetof_stat_end - offsetof_stat_fstype));
+	if (GET_U32LE(offsetof_stat_mode) & ~dm_masks[ctx->version])
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "unknown bits in dm bitfield: %#08"PRIx32,
-			GET_U32LE(offsetof_stat_file_mode) & ~dm_masks[ctx->version]);
+			GET_U32LE(offsetof_stat_mode) & ~dm_masks[ctx->version]);
 	uint32_t offsetof_end = net_offset + 0;
 	if ((uint32_t)GET_U32LE(offsetof_size) != (uint32_t)(offsetof_end - offsetof_size))
 		return lib9p_errorf(ctx, LIB9P_ERRNO_L_EBADMSG, "Twstat->size value is wrong: actual: %"PRIu32" != correct:%"PRIu32,
@@ -1903,30 +1903,30 @@ static void unmarshal_stat([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *net_b
 	[[gnu::unused]] void *extra = &out[1];
 	uint32_t net_offset = 0;
 	net_offset += 2;
-	UNMARSHAL_U16LE(ctx, out->kern_type);
-	UNMARSHAL_U32LE(ctx, out->kern_dev);
-	UNMARSHAL_U8LE(ctx, out->file_qid.type);
-	UNMARSHAL_U32LE(ctx, out->file_qid.vers);
-	UNMARSHAL_U64LE(ctx, out->file_qid.path);
-	UNMARSHAL_U32LE(ctx, out->file_mode);
-	UNMARSHAL_U32LE(ctx, out->file_atime);
-	UNMARSHAL_U32LE(ctx, out->file_mtime);
-	UNMARSHAL_U64LE(ctx, out->file_size);
-	UNMARSHAL_U16LE(ctx, out->file_name.len);
-	UNMARSHAL_BYTES(ctx, out->file_name.utf8, out->file_name.len);
-	UNMARSHAL_U16LE(ctx, out->file_owner_uid.len);
-	UNMARSHAL_BYTES(ctx, out->file_owner_uid.utf8, out->file_owner_uid.len);
-	UNMARSHAL_U16LE(ctx, out->file_owner_gid.len);
-	UNMARSHAL_BYTES(ctx, out->file_owner_gid.utf8, out->file_owner_gid.len);
-	UNMARSHAL_U16LE(ctx, out->file_last_modified_uid.len);
-	UNMARSHAL_BYTES(ctx, out->file_last_modified_uid.utf8, out->file_last_modified_uid.len);
+	UNMARSHAL_U16LE(ctx, out->fstype);
+	UNMARSHAL_U32LE(ctx, out->fsdev);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
+	UNMARSHAL_U32LE(ctx, out->mode);
+	UNMARSHAL_U32LE(ctx, out->atime);
+	UNMARSHAL_U32LE(ctx, out->mtime);
+	UNMARSHAL_U64LE(ctx, out->length);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U16LE(ctx, out->owner_uname.len);
+	UNMARSHAL_BYTES(ctx, out->owner_uname.utf8, out->owner_uname.len);
+	UNMARSHAL_U16LE(ctx, out->owner_gname.len);
+	UNMARSHAL_BYTES(ctx, out->owner_gname.utf8, out->owner_gname.len);
+	UNMARSHAL_U16LE(ctx, out->last_modifier_uname.len);
+	UNMARSHAL_BYTES(ctx, out->last_modifier_uname.utf8, out->last_modifier_uname.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		UNMARSHAL_U16LE(ctx, out->file_extension.len);
-		UNMARSHAL_BYTES(ctx, out->file_extension.utf8, out->file_extension.len);
-		UNMARSHAL_U32LE(ctx, out->file_owner_n_uid);
-		UNMARSHAL_U32LE(ctx, out->file_owner_n_gid);
-		UNMARSHAL_U32LE(ctx, out->file_last_modified_n_uid);
+		UNMARSHAL_U16LE(ctx, out->extension.len);
+		UNMARSHAL_BYTES(ctx, out->extension.utf8, out->extension.len);
+		UNMARSHAL_U32LE(ctx, out->owner_unum);
+		UNMARSHAL_U32LE(ctx, out->owner_gnum);
+		UNMARSHAL_U32LE(ctx, out->last_modifier_unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
@@ -1971,7 +1971,7 @@ static void unmarshal_Tauth([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *net_
 	UNMARSHAL_BYTES(ctx, out->aname.utf8, out->aname.len);
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 	if (( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) )) {
-		UNMARSHAL_U32LE(ctx, out->n_uid);
+		UNMARSHAL_U32LE(ctx, out->unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 }
@@ -2003,7 +2003,7 @@ static void unmarshal_Tattach([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *ne
 	UNMARSHAL_BYTES(ctx, out->aname.utf8, out->aname.len);
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 	if (( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) )) {
-		UNMARSHAL_U32LE(ctx, out->n_uid);
+		UNMARSHAL_U32LE(ctx, out->unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 }
@@ -2254,30 +2254,30 @@ static void unmarshal_Rstat([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *net_
 	UNMARSHAL_U16LE(ctx, out->tag);
 	net_offset += 2;
 	net_offset += 2;
-	UNMARSHAL_U16LE(ctx, out->stat.kern_type);
-	UNMARSHAL_U32LE(ctx, out->stat.kern_dev);
-	UNMARSHAL_U8LE(ctx, out->stat.file_qid.type);
-	UNMARSHAL_U32LE(ctx, out->stat.file_qid.vers);
-	UNMARSHAL_U64LE(ctx, out->stat.file_qid.path);
-	UNMARSHAL_U32LE(ctx, out->stat.file_mode);
-	UNMARSHAL_U32LE(ctx, out->stat.file_atime);
-	UNMARSHAL_U32LE(ctx, out->stat.file_mtime);
-	UNMARSHAL_U64LE(ctx, out->stat.file_size);
-	UNMARSHAL_U16LE(ctx, out->stat.file_name.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_name.utf8, out->stat.file_name.len);
-	UNMARSHAL_U16LE(ctx, out->stat.file_owner_uid.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_owner_uid.utf8, out->stat.file_owner_uid.len);
-	UNMARSHAL_U16LE(ctx, out->stat.file_owner_gid.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_owner_gid.utf8, out->stat.file_owner_gid.len);
-	UNMARSHAL_U16LE(ctx, out->stat.file_last_modified_uid.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_last_modified_uid.utf8, out->stat.file_last_modified_uid.len);
+	UNMARSHAL_U16LE(ctx, out->stat.fstype);
+	UNMARSHAL_U32LE(ctx, out->stat.fsdev);
+	UNMARSHAL_U8LE(ctx, out->stat.qid.type);
+	UNMARSHAL_U32LE(ctx, out->stat.qid.vers);
+	UNMARSHAL_U64LE(ctx, out->stat.qid.path);
+	UNMARSHAL_U32LE(ctx, out->stat.mode);
+	UNMARSHAL_U32LE(ctx, out->stat.atime);
+	UNMARSHAL_U32LE(ctx, out->stat.mtime);
+	UNMARSHAL_U64LE(ctx, out->stat.length);
+	UNMARSHAL_U16LE(ctx, out->stat.name.len);
+	UNMARSHAL_BYTES(ctx, out->stat.name.utf8, out->stat.name.len);
+	UNMARSHAL_U16LE(ctx, out->stat.owner_uname.len);
+	UNMARSHAL_BYTES(ctx, out->stat.owner_uname.utf8, out->stat.owner_uname.len);
+	UNMARSHAL_U16LE(ctx, out->stat.owner_gname.len);
+	UNMARSHAL_BYTES(ctx, out->stat.owner_gname.utf8, out->stat.owner_gname.len);
+	UNMARSHAL_U16LE(ctx, out->stat.last_modifier_uname.len);
+	UNMARSHAL_BYTES(ctx, out->stat.last_modifier_uname.utf8, out->stat.last_modifier_uname.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		UNMARSHAL_U16LE(ctx, out->stat.file_extension.len);
-		UNMARSHAL_BYTES(ctx, out->stat.file_extension.utf8, out->stat.file_extension.len);
-		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_uid);
-		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_gid);
-		UNMARSHAL_U32LE(ctx, out->stat.file_last_modified_n_uid);
+		UNMARSHAL_U16LE(ctx, out->stat.extension.len);
+		UNMARSHAL_BYTES(ctx, out->stat.extension.utf8, out->stat.extension.len);
+		UNMARSHAL_U32LE(ctx, out->stat.owner_unum);
+		UNMARSHAL_U32LE(ctx, out->stat.owner_gnum);
+		UNMARSHAL_U32LE(ctx, out->stat.last_modifier_unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
@@ -2292,30 +2292,30 @@ static void unmarshal_Twstat([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *net
 	UNMARSHAL_U32LE(ctx, out->fid);
 	net_offset += 2;
 	net_offset += 2;
-	UNMARSHAL_U16LE(ctx, out->stat.kern_type);
-	UNMARSHAL_U32LE(ctx, out->stat.kern_dev);
-	UNMARSHAL_U8LE(ctx, out->stat.file_qid.type);
-	UNMARSHAL_U32LE(ctx, out->stat.file_qid.vers);
-	UNMARSHAL_U64LE(ctx, out->stat.file_qid.path);
-	UNMARSHAL_U32LE(ctx, out->stat.file_mode);
-	UNMARSHAL_U32LE(ctx, out->stat.file_atime);
-	UNMARSHAL_U32LE(ctx, out->stat.file_mtime);
-	UNMARSHAL_U64LE(ctx, out->stat.file_size);
-	UNMARSHAL_U16LE(ctx, out->stat.file_name.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_name.utf8, out->stat.file_name.len);
-	UNMARSHAL_U16LE(ctx, out->stat.file_owner_uid.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_owner_uid.utf8, out->stat.file_owner_uid.len);
-	UNMARSHAL_U16LE(ctx, out->stat.file_owner_gid.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_owner_gid.utf8, out->stat.file_owner_gid.len);
-	UNMARSHAL_U16LE(ctx, out->stat.file_last_modified_uid.len);
-	UNMARSHAL_BYTES(ctx, out->stat.file_last_modified_uid.utf8, out->stat.file_last_modified_uid.len);
+	UNMARSHAL_U16LE(ctx, out->stat.fstype);
+	UNMARSHAL_U32LE(ctx, out->stat.fsdev);
+	UNMARSHAL_U8LE(ctx, out->stat.qid.type);
+	UNMARSHAL_U32LE(ctx, out->stat.qid.vers);
+	UNMARSHAL_U64LE(ctx, out->stat.qid.path);
+	UNMARSHAL_U32LE(ctx, out->stat.mode);
+	UNMARSHAL_U32LE(ctx, out->stat.atime);
+	UNMARSHAL_U32LE(ctx, out->stat.mtime);
+	UNMARSHAL_U64LE(ctx, out->stat.length);
+	UNMARSHAL_U16LE(ctx, out->stat.name.len);
+	UNMARSHAL_BYTES(ctx, out->stat.name.utf8, out->stat.name.len);
+	UNMARSHAL_U16LE(ctx, out->stat.owner_uname.len);
+	UNMARSHAL_BYTES(ctx, out->stat.owner_uname.utf8, out->stat.owner_uname.len);
+	UNMARSHAL_U16LE(ctx, out->stat.owner_gname.len);
+	UNMARSHAL_BYTES(ctx, out->stat.owner_gname.utf8, out->stat.owner_gname.len);
+	UNMARSHAL_U16LE(ctx, out->stat.last_modifier_uname.len);
+	UNMARSHAL_BYTES(ctx, out->stat.last_modifier_uname.utf8, out->stat.last_modifier_uname.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		UNMARSHAL_U16LE(ctx, out->stat.file_extension.len);
-		UNMARSHAL_BYTES(ctx, out->stat.file_extension.utf8, out->stat.file_extension.len);
-		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_uid);
-		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_gid);
-		UNMARSHAL_U32LE(ctx, out->stat.file_last_modified_n_uid);
+		UNMARSHAL_U16LE(ctx, out->stat.extension.len);
+		UNMARSHAL_BYTES(ctx, out->stat.extension.utf8, out->stat.extension.len);
+		UNMARSHAL_U32LE(ctx, out->stat.owner_unum);
+		UNMARSHAL_U32LE(ctx, out->stat.owner_gnum);
+		UNMARSHAL_U32LE(ctx, out->stat.last_modifier_unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
@@ -2977,42 +2977,42 @@ static void unmarshal_Rswrite([[gnu::unused]] struct lib9p_ctx *ctx, uint8_t *ne
 
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 static bool marshal_stat(struct lib9p_ctx *ctx, struct lib9p_stat *val, struct _marshal_ret *ret) {
-	uint32_t needed_size = 49 + val->file_name.len + val->file_owner_uid.len + val->file_owner_gid.len + val->file_last_modified_uid.len;
+	uint32_t needed_size = 49 + val->name.len + val->owner_uname.len + val->owner_gname.len + val->last_modifier_uname.len;
 #if CONFIG_9P_ENABLE_9P2000_u
 	if is_ver(ctx, 9P2000_u) {
-		needed_size += 14 + val->file_extension.len;
+		needed_size += 14 + val->extension.len;
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	if (needed_size > ctx->max_msg_size) {
 		return true;
 	}
 	uint32_t offsetof_end = needed_size;
-	uint32_t offsetof_kern_type = 2;
-	MARSHAL_U16LE(ctx, offsetof_end - offsetof_kern_type);
-	MARSHAL_U16LE(ctx, val->kern_type);
-	MARSHAL_U32LE(ctx, val->kern_dev);
-	MARSHAL_U8LE(ctx, val->file_qid.type & qt_masks[ctx->version]);
-	MARSHAL_U32LE(ctx, val->file_qid.vers);
-	MARSHAL_U64LE(ctx, val->file_qid.path);
-	MARSHAL_U32LE(ctx, val->file_mode & dm_masks[ctx->version]);
-	MARSHAL_U32LE(ctx, val->file_atime);
-	MARSHAL_U32LE(ctx, val->file_mtime);
-	MARSHAL_U64LE(ctx, val->file_size);
-	MARSHAL_U16LE(ctx, val->file_name.len);
-	MARSHAL_BYTES(ctx, val->file_name.utf8, val->file_name.len);
-	MARSHAL_U16LE(ctx, val->file_owner_uid.len);
-	MARSHAL_BYTES(ctx, val->file_owner_uid.utf8, val->file_owner_uid.len);
-	MARSHAL_U16LE(ctx, val->file_owner_gid.len);
-	MARSHAL_BYTES(ctx, val->file_owner_gid.utf8, val->file_owner_gid.len);
-	MARSHAL_U16LE(ctx, val->file_last_modified_uid.len);
-	MARSHAL_BYTES(ctx, val->file_last_modified_uid.utf8, val->file_last_modified_uid.len);
+	uint32_t offsetof_fstype = 2;
+	MARSHAL_U16LE(ctx, offsetof_end - offsetof_fstype);
+	MARSHAL_U16LE(ctx, val->fstype);
+	MARSHAL_U32LE(ctx, val->fsdev);
+	MARSHAL_U8LE(ctx, val->qid.type & qt_masks[ctx->version]);
+	MARSHAL_U32LE(ctx, val->qid.vers);
+	MARSHAL_U64LE(ctx, val->qid.path);
+	MARSHAL_U32LE(ctx, val->mode & dm_masks[ctx->version]);
+	MARSHAL_U32LE(ctx, val->atime);
+	MARSHAL_U32LE(ctx, val->mtime);
+	MARSHAL_U64LE(ctx, val->length);
+	MARSHAL_U16LE(ctx, val->name.len);
+	MARSHAL_BYTES(ctx, val->name.utf8, val->name.len);
+	MARSHAL_U16LE(ctx, val->owner_uname.len);
+	MARSHAL_BYTES(ctx, val->owner_uname.utf8, val->owner_uname.len);
+	MARSHAL_U16LE(ctx, val->owner_gname.len);
+	MARSHAL_BYTES(ctx, val->owner_gname.utf8, val->owner_gname.len);
+	MARSHAL_U16LE(ctx, val->last_modifier_uname.len);
+	MARSHAL_BYTES(ctx, val->last_modifier_uname.utf8, val->last_modifier_uname.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		MARSHAL_U16LE(ctx, val->file_extension.len);
-		MARSHAL_BYTES(ctx, val->file_extension.utf8, val->file_extension.len);
-		MARSHAL_U32LE(ctx, val->file_owner_n_uid);
-		MARSHAL_U32LE(ctx, val->file_owner_n_gid);
-		MARSHAL_U32LE(ctx, val->file_last_modified_n_uid);
+		MARSHAL_U16LE(ctx, val->extension.len);
+		MARSHAL_BYTES(ctx, val->extension.utf8, val->extension.len);
+		MARSHAL_U32LE(ctx, val->owner_unum);
+		MARSHAL_U32LE(ctx, val->owner_gnum);
+		MARSHAL_U32LE(ctx, val->last_modifier_unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	return false;
@@ -3086,7 +3086,7 @@ static bool marshal_Tauth(struct lib9p_ctx *ctx, struct lib9p_msg_Tauth *val, st
 	MARSHAL_BYTES_ZEROCOPY(ctx, val->aname.utf8, val->aname.len);
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 	if (( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) )) {
-		MARSHAL_U32LE(ctx, val->n_uid);
+		MARSHAL_U32LE(ctx, val->unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 	return false;
@@ -3139,7 +3139,7 @@ static bool marshal_Tattach(struct lib9p_ctx *ctx, struct lib9p_msg_Tattach *val
 	MARSHAL_BYTES_ZEROCOPY(ctx, val->aname.utf8, val->aname.len);
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 	if (( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) )) {
-		MARSHAL_U32LE(ctx, val->n_uid);
+		MARSHAL_U32LE(ctx, val->unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 	return false;
@@ -3539,10 +3539,10 @@ static bool marshal_Tstat(struct lib9p_ctx *ctx, struct lib9p_msg_Tstat *val, st
 }
 
 static bool marshal_Rstat(struct lib9p_ctx *ctx, struct lib9p_msg_Rstat *val, struct _marshal_ret *ret) {
-	uint32_t needed_size = 58 + val->stat.file_name.len + val->stat.file_owner_uid.len + val->stat.file_owner_gid.len + val->stat.file_last_modified_uid.len;
+	uint32_t needed_size = 58 + val->stat.name.len + val->stat.owner_uname.len + val->stat.owner_gname.len + val->stat.last_modifier_uname.len;
 #if CONFIG_9P_ENABLE_9P2000_u
 	if is_ver(ctx, 9P2000_u) {
-		needed_size += 14 + val->stat.file_extension.len;
+		needed_size += 14 + val->stat.extension.len;
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	if (needed_size > ctx->max_msg_size) {
@@ -3559,48 +3559,48 @@ static bool marshal_Rstat(struct lib9p_ctx *ctx, struct lib9p_msg_Rstat *val, st
 	MARSHAL_U8LE(ctx, 125);
 	MARSHAL_U16LE(ctx, val->tag);
 	MARSHAL_U16LE(ctx, offsetof_end - offsetof_stat);
-	uint32_t offsetof_stat_end = 49 + val->stat.file_name.len + val->stat.file_owner_uid.len + val->stat.file_owner_gid.len + val->stat.file_last_modified_uid.len;
+	uint32_t offsetof_stat_end = 49 + val->stat.name.len + val->stat.owner_uname.len + val->stat.owner_gname.len + val->stat.last_modifier_uname.len;
 #if CONFIG_9P_ENABLE_9P2000_u
 	if is_ver(ctx, 9P2000_u) {
-		offsetof_stat_end += 14 + val->stat.file_extension.len;
+		offsetof_stat_end += 14 + val->stat.extension.len;
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
-	uint32_t offsetof_stat_kern_type = 2;
-	MARSHAL_U16LE(ctx, offsetof_stat_end - offsetof_stat_kern_type);
-	MARSHAL_U16LE(ctx, val->stat.kern_type);
-	MARSHAL_U32LE(ctx, val->stat.kern_dev);
-	MARSHAL_U8LE(ctx, val->stat.file_qid.type & qt_masks[ctx->version]);
-	MARSHAL_U32LE(ctx, val->stat.file_qid.vers);
-	MARSHAL_U64LE(ctx, val->stat.file_qid.path);
-	MARSHAL_U32LE(ctx, val->stat.file_mode & dm_masks[ctx->version]);
-	MARSHAL_U32LE(ctx, val->stat.file_atime);
-	MARSHAL_U32LE(ctx, val->stat.file_mtime);
-	MARSHAL_U64LE(ctx, val->stat.file_size);
-	MARSHAL_U16LE(ctx, val->stat.file_name.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_name.utf8, val->stat.file_name.len);
-	MARSHAL_U16LE(ctx, val->stat.file_owner_uid.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_owner_uid.utf8, val->stat.file_owner_uid.len);
-	MARSHAL_U16LE(ctx, val->stat.file_owner_gid.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_owner_gid.utf8, val->stat.file_owner_gid.len);
-	MARSHAL_U16LE(ctx, val->stat.file_last_modified_uid.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_last_modified_uid.utf8, val->stat.file_last_modified_uid.len);
+	uint32_t offsetof_stat_fstype = 2;
+	MARSHAL_U16LE(ctx, offsetof_stat_end - offsetof_stat_fstype);
+	MARSHAL_U16LE(ctx, val->stat.fstype);
+	MARSHAL_U32LE(ctx, val->stat.fsdev);
+	MARSHAL_U8LE(ctx, val->stat.qid.type & qt_masks[ctx->version]);
+	MARSHAL_U32LE(ctx, val->stat.qid.vers);
+	MARSHAL_U64LE(ctx, val->stat.qid.path);
+	MARSHAL_U32LE(ctx, val->stat.mode & dm_masks[ctx->version]);
+	MARSHAL_U32LE(ctx, val->stat.atime);
+	MARSHAL_U32LE(ctx, val->stat.mtime);
+	MARSHAL_U64LE(ctx, val->stat.length);
+	MARSHAL_U16LE(ctx, val->stat.name.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.name.utf8, val->stat.name.len);
+	MARSHAL_U16LE(ctx, val->stat.owner_uname.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.owner_uname.utf8, val->stat.owner_uname.len);
+	MARSHAL_U16LE(ctx, val->stat.owner_gname.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.owner_gname.utf8, val->stat.owner_gname.len);
+	MARSHAL_U16LE(ctx, val->stat.last_modifier_uname.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.last_modifier_uname.utf8, val->stat.last_modifier_uname.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		MARSHAL_U16LE(ctx, val->stat.file_extension.len);
-		MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_extension.utf8, val->stat.file_extension.len);
-		MARSHAL_U32LE(ctx, val->stat.file_owner_n_uid);
-		MARSHAL_U32LE(ctx, val->stat.file_owner_n_gid);
-		MARSHAL_U32LE(ctx, val->stat.file_last_modified_n_uid);
+		MARSHAL_U16LE(ctx, val->stat.extension.len);
+		MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.extension.utf8, val->stat.extension.len);
+		MARSHAL_U32LE(ctx, val->stat.owner_unum);
+		MARSHAL_U32LE(ctx, val->stat.owner_gnum);
+		MARSHAL_U32LE(ctx, val->stat.last_modifier_unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	return false;
 }
 
 static bool marshal_Twstat(struct lib9p_ctx *ctx, struct lib9p_msg_Twstat *val, struct _marshal_ret *ret) {
-	uint32_t needed_size = 62 + val->stat.file_name.len + val->stat.file_owner_uid.len + val->stat.file_owner_gid.len + val->stat.file_last_modified_uid.len;
+	uint32_t needed_size = 62 + val->stat.name.len + val->stat.owner_uname.len + val->stat.owner_gname.len + val->stat.last_modifier_uname.len;
 #if CONFIG_9P_ENABLE_9P2000_u
 	if is_ver(ctx, 9P2000_u) {
-		needed_size += 14 + val->stat.file_extension.len;
+		needed_size += 14 + val->stat.extension.len;
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	if (needed_size > ctx->max_msg_size) {
@@ -3618,38 +3618,38 @@ static bool marshal_Twstat(struct lib9p_ctx *ctx, struct lib9p_msg_Twstat *val,
 	MARSHAL_U16LE(ctx, val->tag);
 	MARSHAL_U32LE(ctx, val->fid);
 	MARSHAL_U16LE(ctx, offsetof_end - offsetof_stat);
-	uint32_t offsetof_stat_end = 49 + val->stat.file_name.len + val->stat.file_owner_uid.len + val->stat.file_owner_gid.len + val->stat.file_last_modified_uid.len;
+	uint32_t offsetof_stat_end = 49 + val->stat.name.len + val->stat.owner_uname.len + val->stat.owner_gname.len + val->stat.last_modifier_uname.len;
 #if CONFIG_9P_ENABLE_9P2000_u
 	if is_ver(ctx, 9P2000_u) {
-		offsetof_stat_end += 14 + val->stat.file_extension.len;
+		offsetof_stat_end += 14 + val->stat.extension.len;
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
-	uint32_t offsetof_stat_kern_type = 2;
-	MARSHAL_U16LE(ctx, offsetof_stat_end - offsetof_stat_kern_type);
-	MARSHAL_U16LE(ctx, val->stat.kern_type);
-	MARSHAL_U32LE(ctx, val->stat.kern_dev);
-	MARSHAL_U8LE(ctx, val->stat.file_qid.type & qt_masks[ctx->version]);
-	MARSHAL_U32LE(ctx, val->stat.file_qid.vers);
-	MARSHAL_U64LE(ctx, val->stat.file_qid.path);
-	MARSHAL_U32LE(ctx, val->stat.file_mode & dm_masks[ctx->version]);
-	MARSHAL_U32LE(ctx, val->stat.file_atime);
-	MARSHAL_U32LE(ctx, val->stat.file_mtime);
-	MARSHAL_U64LE(ctx, val->stat.file_size);
-	MARSHAL_U16LE(ctx, val->stat.file_name.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_name.utf8, val->stat.file_name.len);
-	MARSHAL_U16LE(ctx, val->stat.file_owner_uid.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_owner_uid.utf8, val->stat.file_owner_uid.len);
-	MARSHAL_U16LE(ctx, val->stat.file_owner_gid.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_owner_gid.utf8, val->stat.file_owner_gid.len);
-	MARSHAL_U16LE(ctx, val->stat.file_last_modified_uid.len);
-	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_last_modified_uid.utf8, val->stat.file_last_modified_uid.len);
+	uint32_t offsetof_stat_fstype = 2;
+	MARSHAL_U16LE(ctx, offsetof_stat_end - offsetof_stat_fstype);
+	MARSHAL_U16LE(ctx, val->stat.fstype);
+	MARSHAL_U32LE(ctx, val->stat.fsdev);
+	MARSHAL_U8LE(ctx, val->stat.qid.type & qt_masks[ctx->version]);
+	MARSHAL_U32LE(ctx, val->stat.qid.vers);
+	MARSHAL_U64LE(ctx, val->stat.qid.path);
+	MARSHAL_U32LE(ctx, val->stat.mode & dm_masks[ctx->version]);
+	MARSHAL_U32LE(ctx, val->stat.atime);
+	MARSHAL_U32LE(ctx, val->stat.mtime);
+	MARSHAL_U64LE(ctx, val->stat.length);
+	MARSHAL_U16LE(ctx, val->stat.name.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.name.utf8, val->stat.name.len);
+	MARSHAL_U16LE(ctx, val->stat.owner_uname.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.owner_uname.utf8, val->stat.owner_uname.len);
+	MARSHAL_U16LE(ctx, val->stat.owner_gname.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.owner_gname.utf8, val->stat.owner_gname.len);
+	MARSHAL_U16LE(ctx, val->stat.last_modifier_uname.len);
+	MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.last_modifier_uname.utf8, val->stat.last_modifier_uname.len);
 #if CONFIG_9P_ENABLE_9P2000_u
 	if (is_ver(ctx, 9P2000_u)) {
-		MARSHAL_U16LE(ctx, val->stat.file_extension.len);
-		MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.file_extension.utf8, val->stat.file_extension.len);
-		MARSHAL_U32LE(ctx, val->stat.file_owner_n_uid);
-		MARSHAL_U32LE(ctx, val->stat.file_owner_n_gid);
-		MARSHAL_U32LE(ctx, val->stat.file_last_modified_n_uid);
+		MARSHAL_U16LE(ctx, val->stat.extension.len);
+		MARSHAL_BYTES_ZEROCOPY(ctx, val->stat.extension.utf8, val->stat.extension.len);
+		MARSHAL_U32LE(ctx, val->stat.owner_unum);
+		MARSHAL_U32LE(ctx, val->stat.owner_gnum);
+		MARSHAL_U32LE(ctx, val->stat.last_modifier_unum);
 	}
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	return false;
@@ -4964,37 +4964,37 @@ static void lib9p_qid_format(struct lib9p_qid *self, struct fmt_state *state) {
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 static void lib9p_stat_format(struct lib9p_stat *self, struct fmt_state *state) {
 	fmt_state_putchar(state, '{');
-	fmt_state_puts(state, " kern_type=");
-	fmt_state_printf(state, "%"PRIu16, self->kern_type);
-	fmt_state_puts(state, " kern_dev=");
-	fmt_state_printf(state, "%"PRIu32, self->kern_dev);
-	fmt_state_puts(state, " file_qid=");
-	lib9p_qid_format(&self->file_qid, state);
-	fmt_state_puts(state, " file_mode=");
-	lib9p_dm_format(&self->file_mode, state);
-	fmt_state_puts(state, " file_atime=");
-	fmt_state_printf(state, "%"PRIu32, self->file_atime);
-	fmt_state_puts(state, " file_mtime=");
-	fmt_state_printf(state, "%"PRIu32, self->file_mtime);
-	fmt_state_puts(state, " file_size=");
-	fmt_state_printf(state, "%"PRIu64, self->file_size);
-	fmt_state_puts(state, " file_name=");
-	lib9p_s_format(&self->file_name, state);
-	fmt_state_puts(state, " file_owner_uid=");
-	lib9p_s_format(&self->file_owner_uid, state);
-	fmt_state_puts(state, " file_owner_gid=");
-	lib9p_s_format(&self->file_owner_gid, state);
-	fmt_state_puts(state, " file_last_modified_uid=");
-	lib9p_s_format(&self->file_last_modified_uid, state);
+	fmt_state_puts(state, " fstype=");
+	fmt_state_printf(state, "%"PRIu16, self->fstype);
+	fmt_state_puts(state, " fsdev=");
+	fmt_state_printf(state, "%"PRIu32, self->fsdev);
+	fmt_state_puts(state, " qid=");
+	lib9p_qid_format(&self->qid, state);
+	fmt_state_puts(state, " mode=");
+	lib9p_dm_format(&self->mode, state);
+	fmt_state_puts(state, " atime=");
+	fmt_state_printf(state, "%"PRIu32, self->atime);
+	fmt_state_puts(state, " mtime=");
+	fmt_state_printf(state, "%"PRIu32, self->mtime);
+	fmt_state_puts(state, " length=");
+	fmt_state_printf(state, "%"PRIu64, self->length);
+	fmt_state_puts(state, " name=");
+	lib9p_s_format(&self->name, state);
+	fmt_state_puts(state, " owner_uname=");
+	lib9p_s_format(&self->owner_uname, state);
+	fmt_state_puts(state, " owner_gname=");
+	lib9p_s_format(&self->owner_gname, state);
+	fmt_state_puts(state, " last_modifier_uname=");
+	lib9p_s_format(&self->last_modifier_uname, state);
 #if CONFIG_9P_ENABLE_9P2000_u
-	fmt_state_puts(state, " file_extension=");
-	lib9p_s_format(&self->file_extension, state);
-	fmt_state_puts(state, " file_owner_n_uid=");
-	lib9p_nuid_format(&self->file_owner_n_uid, state);
-	fmt_state_puts(state, " file_owner_n_gid=");
-	lib9p_nuid_format(&self->file_owner_n_gid, state);
-	fmt_state_puts(state, " file_last_modified_n_uid=");
-	lib9p_nuid_format(&self->file_last_modified_n_uid, state);
+	fmt_state_puts(state, " extension=");
+	lib9p_s_format(&self->extension, state);
+	fmt_state_puts(state, " owner_unum=");
+	lib9p_nuid_format(&self->owner_unum, state);
+	fmt_state_puts(state, " owner_gnum=");
+	lib9p_nuid_format(&self->owner_gnum, state);
+	fmt_state_puts(state, " last_modifier_unum=");
+	lib9p_nuid_format(&self->last_modifier_unum, state);
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 	fmt_state_puts(state, " }");
 }
@@ -5109,8 +5109,8 @@ static void lib9p_msg_Tauth_format(struct lib9p_msg_Tauth *self, struct fmt_stat
 	fmt_state_puts(state, " aname=");
 	lib9p_s_format(&self->aname, state);
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-	fmt_state_puts(state, " n_uid=");
-	lib9p_nuid_format(&self->n_uid, state);
+	fmt_state_puts(state, " unum=");
+	lib9p_nuid_format(&self->unum, state);
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 	fmt_state_puts(state, " }");
 }
@@ -5137,8 +5137,8 @@ static void lib9p_msg_Tattach_format(struct lib9p_msg_Tattach *self, struct fmt_
 	fmt_state_puts(state, " aname=");
 	lib9p_s_format(&self->aname, state);
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-	fmt_state_puts(state, " n_uid=");
-	lib9p_nuid_format(&self->n_uid, state);
+	fmt_state_puts(state, " unum=");
+	lib9p_nuid_format(&self->unum, state);
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 	fmt_state_puts(state, " }");
 }