Skip to content

Commit b68baf9

Browse files
author
Kent Overstreet
committed
bcachefs: Print devices we're mounting on multi device filesystems
Previously, we only ever logged the filesystem UUID. Signed-off-by: Kent Overstreet <[email protected]>
1 parent 205da7c commit b68baf9

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

fs/bcachefs/super.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,12 +1067,13 @@ noinline_for_stack
10671067
static void print_mount_opts(struct bch_fs *c)
10681068
{
10691069
enum bch_opt_id i;
1070-
struct printbuf p = PRINTBUF;
1071-
bool first = true;
1070+
CLASS(printbuf, p)();
1071+
bch2_log_msg_start(c, &p);
10721072

10731073
prt_str(&p, "starting version ");
10741074
bch2_version_to_text(&p, c->sb.version);
10751075

1076+
bool first = true;
10761077
for (i = 0; i < bch2_opts_nr; i++) {
10771078
const struct bch_option *opt = &bch2_opt_table[i];
10781079
u64 v = bch2_opt_get_by_id(&c->opts, i);
@@ -1089,17 +1090,24 @@ static void print_mount_opts(struct bch_fs *c)
10891090
}
10901091

10911092
if (c->sb.version_incompat_allowed != c->sb.version) {
1092-
prt_printf(&p, "\n allowing incompatible features above ");
1093+
prt_printf(&p, "\nallowing incompatible features above ");
10931094
bch2_version_to_text(&p, c->sb.version_incompat_allowed);
10941095
}
10951096

10961097
if (c->opts.verbose) {
1097-
prt_printf(&p, "\n features: ");
1098+
prt_printf(&p, "\nfeatures: ");
10981099
prt_bitflags(&p, bch2_sb_features, c->sb.features);
10991100
}
11001101

1101-
bch_info(c, "%s", p.buf);
1102-
printbuf_exit(&p);
1102+
if (c->sb.multi_device) {
1103+
prt_printf(&p, "\nwith devices");
1104+
for_each_online_member(c, ca, BCH_DEV_READ_REF_bch2_online_devs) {
1105+
prt_char(&p, ' ');
1106+
prt_str(&p, ca->name);
1107+
}
1108+
}
1109+
1110+
bch2_print_str(c, KERN_INFO, p.buf);
11031111
}
11041112

11051113
static bool bch2_fs_may_start(struct bch_fs *c)

0 commit comments

Comments
 (0)