]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
bcachefs: print label correctly in sb_member_to_text()
authorKent Overstreet <kent.overstreet@linux.dev>
Sat, 10 May 2025 03:15:40 +0000 (23:15 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Thu, 22 May 2025 00:14:52 +0000 (20:14 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/sb-members.c

index b9568a68fbf64caed7fa4aefee9aa3b84b8738c9..75184d8e685a85a951f1fec28476a34d59f50cb4 100644 (file)
@@ -222,17 +222,11 @@ static void member_to_text(struct printbuf *out,
        printbuf_indent_add(out, 2);
 
        prt_printf(out, "Label:\t");
-       if (BCH_MEMBER_GROUP(&m)) {
-               unsigned idx = BCH_MEMBER_GROUP(&m) - 1;
-
-               if (idx < disk_groups_nr(gi))
-                       prt_printf(out, "%s (%u)",
-                                  gi->entries[idx].label, idx);
-               else
-                       prt_printf(out, "(bad disk labels section)");
-       } else {
+       if (BCH_MEMBER_GROUP(&m))
+               bch2_disk_path_to_text_sb(out, sb,
+                               BCH_MEMBER_GROUP(&m) - 1);
+       else
                prt_printf(out, "(none)");
-       }
        prt_newline(out);
 
        prt_printf(out, "UUID:\t");