diff options
Diffstat (limited to 'libbcachefs.c')
| -rw-r--r-- | libbcachefs.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/libbcachefs.c b/libbcachefs.c index c8738f40..d4993a15 100644 --- a/libbcachefs.c +++ b/libbcachefs.c @@ -403,6 +403,7 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f, char data_allowed_str[100]; char data_has_str[100]; char group[64]; + char time_str[64]; if (!bch2_member_exists(m)) continue; @@ -435,6 +436,15 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f, if (!data_has_str[0]) strcpy(data_has_str, "(none)"); + if (last_mount) { + struct tm *tm = localtime(&last_mount); + size_t err = strftime(time_str, sizeof(time_str), "%c", tm); + if (!err) + strcpy(time_str, "(formatting error)"); + } else { + strcpy(time_str, "(never)"); + } + printf(" Device %u:\n" " UUID: %s\n" " Size: %s\n" @@ -456,7 +466,7 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f, pr_units(le16_to_cpu(m->bucket_size), units), le16_to_cpu(m->first_bucket), le64_to_cpu(m->nbuckets), - last_mount ? ctime(&last_mount) : "(never)", + time_str, BCH_MEMBER_STATE(m) < BCH_MEMBER_STATE_NR ? bch2_dev_state[BCH_MEMBER_STATE(m)] @@ -558,15 +568,26 @@ void bch2_sb_print(struct bch_sb *sb, bool print_layout, char user_uuid_str[40], internal_uuid_str[40]; char fields_have_str[200]; char label[BCH_SB_LABEL_SIZE + 1]; + char time_str[64]; struct bch_sb_field *f; u64 fields_have = 0; unsigned nr_devices = 0; + time_t time_base = le64_to_cpu(sb->time_base_lo) / NSEC_PER_SEC; memset(label, 0, sizeof(label)); memcpy(label, sb->label, sizeof(sb->label)); uuid_unparse(sb->user_uuid.b, user_uuid_str); uuid_unparse(sb->uuid.b, internal_uuid_str); + if (time_base) { + struct tm *tm = localtime(&time_base); + size_t err = strftime(time_str, sizeof(time_str), "%c", tm); + if (!err) + strcpy(time_str, "(formatting error)"); + } else { + strcpy(time_str, "(not set)"); + } + mi = bch2_sb_get_members(sb); if (mi) { struct bch_member *m; @@ -586,6 +607,7 @@ void bch2_sb_print(struct bch_sb *sb, bool print_layout, "Internal UUID: %s\n" "Label: %s\n" "Version: %llu\n" + "Created: %s\n" "Block_size: %s\n" "Btree node size: %s\n" "Error action: %s\n" @@ -614,6 +636,7 @@ void bch2_sb_print(struct bch_sb *sb, bool print_layout, internal_uuid_str, label, le64_to_cpu(sb->version), + time_str, pr_units(le16_to_cpu(sb->block_size), units), pr_units(BCH_SB_BTREE_NODE_SIZE(sb), units), |