bcachefs: Print devices we're mounting on multi device filesystems

Previously, we only ever logged the filesystem UUID.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index ae8fa58a208df53eac19bc3cfcd158ed1babbcfa..a5b97c9c5163545a7ff91a69b53884dc81a059c9 100644 (file)
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -1067,12 +1067,13 @@ noinline_for_stack
 static void print_mount_opts(struct bch_fs *c)
 {
        enum bch_opt_id i;
-       struct printbuf p = PRINTBUF;
-       bool first = true;
+       CLASS(printbuf, p)();
+       bch2_log_msg_start(c, &p);
 
        prt_str(&p, "starting version ");
        bch2_version_to_text(&p, c->sb.version);
 
+       bool first = true;
        for (i = 0; i < bch2_opts_nr; i++) {
                const struct bch_option *opt = &bch2_opt_table[i];
                u64 v = bch2_opt_get_by_id(&c->opts, i);
@@ -1089,17 +1090,24 @@ static void print_mount_opts(struct bch_fs *c)
        }
 
        if (c->sb.version_incompat_allowed != c->sb.version) {
-               prt_printf(&p, "\n  allowing incompatible features above ");
+               prt_printf(&p, "\nallowing incompatible features above ");
                bch2_version_to_text(&p, c->sb.version_incompat_allowed);
        }
 
        if (c->opts.verbose) {
-               prt_printf(&p, "\n  features: ");
+               prt_printf(&p, "\nfeatures: ");
                prt_bitflags(&p, bch2_sb_features, c->sb.features);
        }
 
-       bch_info(c, "%s", p.buf);
-       printbuf_exit(&p);
+       if (c->sb.multi_device) {
+               prt_printf(&p, "\nwith devices");
+               for_each_online_member(c, ca, BCH_DEV_READ_REF_bch2_online_devs) {
+                       prt_char(&p, ' ');
+                       prt_str(&p, ca->name);
+               }
+       }
+
+       bch2_print_str(c, KERN_INFO, p.buf);
 }
 
 static bool bch2_fs_may_start(struct bch_fs *c)