bcachefs: Make log message at startup a bit cleaner
authorKent Overstreet <kent.overstreet@linux.dev>
Wed, 21 Dec 2022 00:27:02 +0000 (19:27 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:48 +0000 (17:09 -0400)
Don't print out opts= if no options have been specified.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/super.c

index 37dce3e3cccbfcfe2874f7d011a957697d806334..c911a07f8e8e9ec905bcb9661d6c447ad9840a83 100644 (file)
@@ -846,9 +846,12 @@ static void print_mount_opts(struct bch_fs *c)
        struct printbuf p = PRINTBUF;
        bool first = true;
 
+       prt_printf(&p, "mounted version=%s", bch2_metadata_versions[c->sb.version]);
+
        if (c->opts.read_only) {
-               prt_printf(&p, "ro");
+               prt_str(&p, " opts=");
                first = false;
+               prt_printf(&p, "ro");
        }
 
        for (i = 0; i < bch2_opts_nr; i++) {
@@ -861,16 +864,12 @@ static void print_mount_opts(struct bch_fs *c)
                if (v == bch2_opt_get_by_id(&bch2_opts_default, i))
                        continue;
 
-               if (!first)
-                       prt_printf(&p, ",");
+               prt_str(&p, first ? " opts=" : ",");
                first = false;
                bch2_opt_to_text(&p, c, c->disk_sb.sb, opt, v, OPT_SHOW_MOUNT_STYLE);
        }
 
-       if (!p.pos)
-               prt_printf(&p, "(null)");
-
-       bch_info(c, "mounted version=%s opts=%s", bch2_metadata_versions[c->sb.version], p.buf);
+       bch_info(c, "%s", p.buf);
        printbuf_exit(&p);
 }