From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Thu, 22 May 2025 20:04:15 +0000 (-0400)
Subject: bcachefs: Clear trans->locked before unlock
X-Git-Tag: v6.16-rc1~211^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df92f3500b3f78b8e0ed3faa95c15a834ea9a821;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Clear trans->locked before unlock

We're adding new should_be_locked assertions: it's going to be illegal
to unlock a should_be_locked path when trans->locked is true.

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

diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
index 78f485ed17469..826930b4b1645 100644
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -846,9 +846,9 @@ int bch2_trans_relock_notrace(struct btree_trans *trans)
 
 void bch2_trans_unlock(struct btree_trans *trans)
 {
-	__bch2_trans_unlock(trans);
-
 	trans_set_unlocked(trans);
+
+	__bch2_trans_unlock(trans);
 }
 
 void bch2_trans_unlock_long(struct btree_trans *trans)