From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 20 Aug 2024 19:04:15 +0000 (-0400)
Subject: bcachefs: fix failure to relock in btree_node_fill()
X-Git-Tag: v6.11-rc5~1^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dbfc4ef72f15508882aff58c307b8425cf037a8;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: fix failure to relock in btree_node_fill()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
index 063725ecb2b38..e52a06d3418cc 100644
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@ -873,6 +873,10 @@ static noinline struct btree *bch2_btree_node_fill(struct btree_trans *trans,
 
 		bch2_btree_node_read(trans, b, sync);
 
+		int ret = bch2_trans_relock(trans);
+		if (ret)
+			return ERR_PTR(ret);
+
 		if (!sync)
 			return NULL;