From 078d2f6073ba1347ab361fe28962558bae522652 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 30 Jul 2018 14:15:22 -0700 Subject: [PATCH] scoutfs-utils: update format for greeting node_id Signed-off-by: Zach Brown --- utils/src/format.h | 2 ++ utils/src/mkfs.c | 1 + utils/src/print.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/utils/src/format.h b/utils/src/format.h index 5a01f57b..95f732c9 100644 --- a/utils/src/format.h +++ b/utils/src/format.h @@ -368,6 +368,7 @@ struct scoutfs_super_block { __le64 alloc_cursor; struct scoutfs_btree_ring bring; __le64 next_seg_seq; + __le64 next_node_id; struct scoutfs_btree_root alloc_root; struct scoutfs_manifest manifest; struct scoutfs_inet_addr server_addr; @@ -514,6 +515,7 @@ struct scoutfs_lock_name { struct scoutfs_net_greeting { __le64 fsid; __le64 format_hash; + __le64 node_id; } __packed; /* diff --git a/utils/src/mkfs.c b/utils/src/mkfs.c index 678114ef..275a0347 100644 --- a/utils/src/mkfs.c +++ b/utils/src/mkfs.c @@ -226,6 +226,7 @@ static int write_new_fs(char *path, int fd) super->next_seq = cpu_to_le64(1); super->total_blocks = cpu_to_le64(total_blocks); super->next_seg_seq = cpu_to_le64(2); + super->next_node_id = cpu_to_le64(1); /* align the btree ring to the segment after the super */ blkno = round_up(SCOUTFS_SUPER_BLKNO + 1, SCOUTFS_SEGMENT_BLOCKS); diff --git a/utils/src/print.c b/utils/src/print.c index 5b67f564..95b7ff45 100644 --- a/utils/src/print.c +++ b/utils/src/print.c @@ -457,6 +457,7 @@ static void print_super_block(struct scoutfs_super_block *super, u64 blkno) /* XXX these are all in a crazy order */ printf(" next_ino %llu next_seq %llu next_seg_seq %llu\n" + " next_node_id %llu\n" " total_blocks %llu free_blocks %llu alloc_cursor %llu\n" " btree ring: first_blkno %llu nr_blocks %llu next_block %llu " "next_seq %llu\n" @@ -465,6 +466,7 @@ static void print_super_block(struct scoutfs_super_block *super, u64 blkno) le64_to_cpu(super->next_ino), le64_to_cpu(super->next_seq), le64_to_cpu(super->next_seg_seq), + le64_to_cpu(super->next_node_id), le64_to_cpu(super->total_blocks), le64_to_cpu(super->free_blocks), le64_to_cpu(super->alloc_cursor),