From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 18 Aug 2024 19:08:12 +0000 (-0400)
Subject: bcachefs: Fix failure to relock in btree_node_get()
X-Git-Tag: v6.11-rc5~1^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49203a6b9d12bfd1a223a67847a631a78f1cd782;p=thirdparty%2Flinux.git

bcachefs: Fix failure to relock in btree_node_get()

discovered by new trans->locked asserts

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

diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
index f5d85b50b6f2f..cc778d7e769e7 100644
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@ -974,6 +974,10 @@ retry:
 
 		bch2_btree_node_wait_on_read(b);
 
+		ret = bch2_trans_relock(trans);
+		if (ret)
+			return ERR_PTR(ret);
+
 		/*
 		 * should_be_locked is not set on this path yet, so we need to
 		 * relock it specifically: