summaryrefslogtreecommitdiff
path: root/fs/bcachefs/sb-members.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-11-14 15:36:46 +0000
committerMark Brown <broonie@kernel.org>2024-11-14 15:36:46 +0000
commit9a5a75bf1f485e2d109303a996d147b94c5e79c9 (patch)
treef931f0d17bef0b6ad980aaf3d2d8b874ef2b749c /fs/bcachefs/sb-members.c
parentf3f9f0de30a5106078cd610f80eaa6f9386b2186 (diff)
parent3b7e11a0116c30848d44429650ad80f9cc3bd963 (diff)
downloadlinux-9a5a75bf1f485e2d109303a996d147b94c5e79c9.tar.gz
linux-9a5a75bf1f485e2d109303a996d147b94c5e79c9.tar.bz2
linux-9a5a75bf1f485e2d109303a996d147b94c5e79c9.zip
ASoc: simple-mux: Allow to specify an idle-state
Merge series from "Hendrik v. Raven" <h.v.raven@merzmedtech.de>: This series adds support for the idle-state property from the mux framework to the simple-mux audio variant. It allows to specify the state of the mux when it is not in use.
Diffstat (limited to 'fs/bcachefs/sb-members.c')
-rw-r--r--fs/bcachefs/sb-members.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/bcachefs/sb-members.c b/fs/bcachefs/sb-members.c
index 02bcde3c1b02..fb08dd680dac 100644
--- a/fs/bcachefs/sb-members.c
+++ b/fs/bcachefs/sb-members.c
@@ -163,6 +163,11 @@ static int validate_member(struct printbuf *err,
return -BCH_ERR_invalid_sb_members;
}
+ if (m.btree_bitmap_shift >= 64) {
+ prt_printf(err, "device %u: invalid btree_bitmap_shift %u", i, m.btree_bitmap_shift);
+ return -BCH_ERR_invalid_sb_members;
+ }
+
return 0;
}
@@ -247,7 +252,10 @@ static void member_to_text(struct printbuf *out,
prt_newline(out);
prt_printf(out, "Btree allocated bitmap blocksize:\t");
- prt_units_u64(out, 1ULL << m.btree_bitmap_shift);
+ if (m.btree_bitmap_shift < 64)
+ prt_units_u64(out, 1ULL << m.btree_bitmap_shift);
+ else
+ prt_printf(out, "(invalid shift %u)", m.btree_bitmap_shift);
prt_newline(out);
prt_printf(out, "Btree allocated bitmap:\t");