From: Kent Overstreet Date: Thu, 23 Feb 2023 00:39:02 +0000 (-0500) Subject: bcachefs: Don't call bch2_trans_update() unlocked X-Git-Tag: io_uring-6.7-2023-11-10~119^2~478 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e9b70146545120f7d4bdba87eb8ec9a8f1669c7d;p=linux-block.git bcachefs: Don't call bch2_trans_update() unlocked Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index c964643e7ebf..814ca33a15f6 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -226,7 +226,8 @@ static int bch2_extent_drop_ptrs(struct btree_trans *trans, if (bkey_deleted(&n->k)) n->k.size = 0; - return bch2_trans_update(trans, iter, n, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?: + return bch2_trans_relock(trans) ?: + bch2_trans_update(trans, iter, n, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?: bch2_trans_commit(trans, NULL, NULL, BTREE_INSERT_NOFAIL); }