summaryrefslogtreecommitdiff
path: root/libbcachefs/sb-members.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-10-27 19:38:36 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-27 19:38:36 -0400
commitd320a4e927fd706b34c714b77130965a385ea4fb (patch)
treef993f8a9eb9bfe61c337ec98195907f10e3916f8 /libbcachefs/sb-members.c
parent8eaf8ddf45fbcd9900b561f2804f145f06417db5 (diff)
Update bcachefs sources to 6628827a8707 bcachefs: Skip deleted members in member_to_text()
Diffstat (limited to 'libbcachefs/sb-members.c')
-rw-r--r--libbcachefs/sb-members.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/libbcachefs/sb-members.c b/libbcachefs/sb-members.c
index 032fe454..ab5de12e 100644
--- a/libbcachefs/sb-members.c
+++ b/libbcachefs/sb-members.c
@@ -168,6 +168,9 @@ static void member_to_text(struct printbuf *out,
u64 bucket_size = le16_to_cpu(m.bucket_size);
u64 device_size = le64_to_cpu(m.nbuckets) * bucket_size;
+ if (!bch2_member_exists(&m))
+ return;
+
prt_printf(out, "Device:");
prt_tab(out);
prt_printf(out, "%u", i);
@@ -304,10 +307,8 @@ static void bch2_sb_members_v1_to_text(struct printbuf *out, struct bch_sb *sb,
struct bch_sb_field_disk_groups *gi = bch2_sb_field_get(sb, disk_groups);
unsigned i;
- for (i = 0; i < sb->nr_devices; i++) {
- struct bch_member m = members_v1_get(mi, i);
- member_to_text(out, m, gi, sb, i);
- }
+ for (i = 0; i < sb->nr_devices; i++)
+ member_to_text(out, members_v1_get(mi, i), gi, sb, i);
}
const struct bch_sb_field_ops bch_sb_field_ops_members_v1 = {
@@ -322,10 +323,8 @@ static void bch2_sb_members_v2_to_text(struct printbuf *out, struct bch_sb *sb,
struct bch_sb_field_disk_groups *gi = bch2_sb_field_get(sb, disk_groups);
unsigned i;
- for (i = 0; i < sb->nr_devices; i++) {
- struct bch_member m = members_v2_get(mi, i);
- member_to_text(out, m, gi, sb, i);
- }
+ for (i = 0; i < sb->nr_devices; i++)
+ member_to_text(out, members_v2_get(mi, i), gi, sb, i);
}
static int bch2_sb_members_v2_validate(struct bch_sb *sb,