From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sat, 21 Dec 2024 07:55:03 +0000 (-0500)
Subject: bcachefs: btree_path_very_locks(): verify lock seq
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6adc5af50a5401a19c1f23b3ed2ebfd3a0d8cdc6;p=users%2Fwilly%2Flinux.git

bcachefs: btree_path_very_locks(): verify lock seq

If the btree_path's lock seq is wrong, the next bch2_trans_relock()
operation is guaranteed to fail and we take an unnecessary transaction
restart.

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

diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
index d343df9f0ad2..b339c209345a 100644
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -856,6 +856,9 @@ void bch2_btree_path_verify_locks(struct btree_path *path)
 		       (want == BTREE_NODE_UNLOCKED ||
 			have != BTREE_NODE_WRITE_LOCKED) &&
 		       want != have);
+
+		BUG_ON(btree_node_locked(path, l) &&
+		       path->l[l].lock_seq != six_lock_seq(&path->l[l].b->c.lock));
 	}
 }