From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sat, 10 May 2025 03:15:40 +0000 (-0400)
Subject: bcachefs: print label correctly in sb_member_to_text()
X-Git-Tag: v6.16-rc1~211^2~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b7b0c3996b570f9c305c6f3df475a719920d65c;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: print label correctly in sb_member_to_text()

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

diff --git a/fs/bcachefs/sb-members.c b/fs/bcachefs/sb-members.c
index b9568a68fbf64..75184d8e685a8 100644
--- a/fs/bcachefs/sb-members.c
+++ b/fs/bcachefs/sb-members.c
@@ -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");