diff options
author | Ingo Molnar <mingo@kernel.org> | 2025-03-03 21:05:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2025-03-03 21:05:45 +0100 |
commit | 1fff9f8730b00c39ec5055656e45ef69acd9409a (patch) | |
tree | 96fea59eb525c4e76ec0872ff74962c6f28fab8b /fs/bcachefs/journal.c | |
parent | 604ea3e90b17f27928a64d86259c57710c254438 (diff) | |
parent | 7eb172143d5508b4da468ed59ee857c6e5e01da6 (diff) |
Merge tag 'v6.14-rc5' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/bcachefs/journal.c')
-rw-r--r-- | fs/bcachefs/journal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index 24c294d4634e..5dabbf3c0965 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -1194,7 +1194,9 @@ int bch2_set_nr_journal_buckets(struct bch_fs *c, struct bch_dev *ca, closure_sync(&cl); - if (ret && ret != -BCH_ERR_bucket_alloc_blocked) + if (ret && + ret != -BCH_ERR_bucket_alloc_blocked && + ret != -BCH_ERR_open_buckets_empty) break; } |