Merge branch 'lukeshu/9p-tidy'

1 files changed, 13 insertions, 18 deletions

diff --git a/cmd/sbc_harness/fs_harness_flash_bin.c b/cmd/sbc_harness/fs_harness_flash_bin.c
index bc3d061..5920b85 100644
--- a/cmd/sbc_harness/fs_harness_flash_bin.c
+++ b/cmd/sbc_harness/fs_harness_flash_bin.c
@@ -148,30 +148,25 @@ static struct lib9p_qid flash_file_qid(struct flash_file *self) {
 	};
 }
 
-static struct lib9p_stat flash_file_stat(struct flash_file *self, struct lib9p_srv_ctx *ctx) {
+static struct lib9p_srv_stat flash_file_stat(struct flash_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
-	return (struct lib9p_stat){
-		.kern_type                = 0,
-		.kern_dev                 = 0,
-		.file_qid                 = flash_file_qid(self),
-		.file_mode                = LIB9P_DM_EXCL|0666,
-		.file_atime               = UTIL9P_ATIME,
-		.file_mtime               = UTIL9P_MTIME,
-		.file_size                = DATA_SIZE,
-		.file_name                = lib9p_str(self->name),
-		.file_owner_uid           = lib9p_str("root"),
-		.file_owner_gid           = lib9p_str("root"),
-		.file_last_modified_uid   = lib9p_str("root"),
-		.file_extension           = lib9p_str(NULL),
-		.file_owner_n_uid         = 0,
-		.file_owner_n_gid         = 0,
-		.file_last_modified_n_uid = 0,
+	return (struct lib9p_srv_stat){
+		.qid                 = flash_file_qid(self),
+		.mode                = LIB9P_DM_EXCL|0666,
+		.atime_sec           = UTIL9P_ATIME,
+		.mtime_sec           = UTIL9P_MTIME,
+		.size                = DATA_SIZE,
+		.name                = lib9p_str(self->name),
+		.owner_uid           = { .name = lib9p_str("root"), .num  = 0 },
+		.owner_gid           = { .name = lib9p_str("root"), .num  = 0 },
+		.last_modifier_uid   = { .name = lib9p_str("root"), .num  = 0 },
+		.extension           = lib9p_str(NULL),
 	};
 }
 static void flash_file_wstat(struct flash_file *self, struct lib9p_srv_ctx *ctx,
-                                    struct lib9p_stat) {
+                                    struct lib9p_srv_stat) {
 	assert(self);
 	assert(ctx);