alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-02 00:00:03 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Rename group to label in show-super output

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2021-12-13 17:14:44 -05:00
parent 39a6bf885d
commit 57f6402131
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bcachefs.c
View File

@ -37,14 +37,14 @@ static void usage(void)
"Repair:\n"
" fsck Check an existing filesystem for errors\n"
"\n"
"Startup/shutdown, assembly of multi device filesystems:\n"
#if 0
"Startup/shutdown, assembly of multi device filesystems:\n"
" assemble Assemble an existing multi device filesystem\n"
" incremental Incrementally assemble an existing multi device filesystem\n"
" run Start a partially assembled filesystem\n"
" stop Stop a running filesystem\n"
#endif
"\n"
#endif
"Commands for managing a running filesystem:\n"
" fs usage Show disk usage\n"
"\n"

20
libbcachefs.c
View File

@ -231,7 +231,7 @@ struct bch_sb *bch2_format(struct bch_opt_strs fs_opt_strs,
/* Member info: */
mi = bch2_sb_resize_members(&sb,
(sizeof(*mi) + sizeof(struct bch_member) *
nr_devs) / sizeof(u64));
nr_devs) / sizeof(u64));
for (i = devs; i < devs + nr_devs; i++) {
struct bch_member *m = mi->members + (i - devs);
@ -410,10 +410,10 @@ static int bch2_sb_get_target(struct bch_sb *sb, char *buf, size_t len, u64 v)
struct bch_disk_group *g = gi->entries + t.group;
if (t.group < disk_groups_nr(gi) && !BCH_GROUP_DELETED(g)) {
ret = scnprintf(buf, len, "Group %u (%.*s)", t.group,
ret = scnprintf(buf, len, "Label %u (%.*s)", t.group,
BCH_SB_LABEL_SIZE, g->label);
} else {
ret = scnprintf(buf, len, "Bad group %u", t.group);
ret = scnprintf(buf, len, "Bad label %u", t.group);
}
break;
}
@ -475,7 +475,7 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f,
char member_uuid_str[40];
char data_allowed_str[100];
char data_has_str[100];
char group[BCH_SB_LABEL_SIZE+10];
char label [BCH_SB_LABEL_SIZE+10];
char time_str[64];
if (!bch2_member_exists(m))
@ -487,14 +487,14 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f,
unsigned idx = BCH_MEMBER_GROUP(m) - 1;
if (idx < disk_groups_nr(gi)) {
snprintf(group, sizeof(group), "%.*s (%u)",
scnprintf(label, sizeof(label), "%.*s (%u)",
BCH_SB_LABEL_SIZE,
gi->entries[idx].label, idx);
} else {
strcpy(group, "(bad disk groups section)");
strcpy(label, "(bad disk labels section)");
}
} else {
strcpy(group, "(none)");
strcpy(label, "(none)");
}
bch2_flags_to_text(&PBUF(data_allowed_str),
@ -545,7 +545,7 @@ static void bch2_sb_print_members(struct bch_sb *sb, struct bch_sb_field *f,
? bch2_member_states[BCH_MEMBER_STATE(m)]
: "unknown",
group,
label,
data_allowed_str,
data_has_str,
@ -573,7 +573,7 @@ static void bch2_sb_print_crypt(struct bch_sb *sb, struct bch_sb_field *f,
}
static void bch2_sb_print_replicas_v0(struct bch_sb *sb, struct bch_sb_field *f,
enum units units)
enum units units)
{
struct bch_sb_field_replicas_v0 *replicas = field_to_type(f, replicas_v0);
struct bch_replicas_entry_v0 *e;
@ -636,7 +636,7 @@ static void bch2_sb_print_clean(struct bch_sb *sb, struct bch_sb_field *f,
}
static void bch2_sb_print_journal_seq_blacklist(struct bch_sb *sb, struct bch_sb_field *f,
enum units units)
enum units units)
{
struct bch_sb_field_journal_seq_blacklist *bl = field_to_type(f, journal_seq_blacklist);
unsigned i, nr = blacklist_nr_entries(bl);