summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-05-29 02:26:04 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-06-20 22:55:58 -0400
commit2bfb9070a483e98afb26106b431e9ec2f3336f15 (patch)
treecdba3951b850964c17b6f16542a71ea042dc02f8
parent840bc8a70d3f11525e87ae42db6a130cd8500bf8 (diff)
bcachefs: Fix error handling in promote path
The promote path had a BUG_ON() for unknown error type, which we're now seeing: change it to a WARN_ON() - because we're curious what this is - and otherwise handle it in the normal error path. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--fs/bcachefs/io.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c
index 0f8d52912c2d..199a8348355a 100644
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -2057,14 +2057,16 @@ static struct promote_op *__promote_alloc(struct btree_trans *trans,
.write_flags = BCH_WRITE_ALLOC_NOWAIT|BCH_WRITE_CACHED,
},
btree_id, k);
- if (ret == -BCH_ERR_nocow_lock_blocked) {
+ if (ret) {
+ WARN_ONCE(ret != -BCH_ERR_nocow_lock_blocked,
+ "%s: saw unknown error %s\n", __func__, bch2_err_str(ret));
+
ret = rhashtable_remove_fast(&c->promote_table, &op->hash,
bch_promote_params);
BUG_ON(ret);
goto err;
}
- BUG_ON(ret);
op->write.op.end_io = promote_done;
return op;