diff options
| author | Mark Brown <broonie@kernel.org> | 2024-11-14 15:36:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-11-14 15:36:46 +0000 |
| commit | 9a5a75bf1f485e2d109303a996d147b94c5e79c9 (patch) | |
| tree | f931f0d17bef0b6ad980aaf3d2d8b874ef2b749c /fs/bcachefs/error.c | |
| parent | f3f9f0de30a5106078cd610f80eaa6f9386b2186 (diff) | |
| parent | 3b7e11a0116c30848d44429650ad80f9cc3bd963 (diff) | |
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/error.c')
| -rw-r--r-- | fs/bcachefs/error.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c index 7a79f695ba2e..b679def8fb98 100644 --- a/fs/bcachefs/error.c +++ b/fs/bcachefs/error.c @@ -251,7 +251,10 @@ int __bch2_fsck_err(struct bch_fs *c, * delete the key) * - and we don't need to warn if we're not prompting */ - WARN_ON(!(flags & FSCK_AUTOFIX) && !trans && bch2_current_has_btree_trans(c)); + WARN_ON((flags & FSCK_CAN_FIX) && + !(flags & FSCK_AUTOFIX) && + !trans && + bch2_current_has_btree_trans(c)); if ((flags & FSCK_CAN_FIX) && test_bit(err, c->sb.errors_silent)) |