From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 26 Aug 2022 01:42:46 +0000 (-0400)
Subject: bcachefs: Correctly initialize bkey_cached->lock
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=06a53943222be722e5f85782721e4701bcd424e8;p=linux.git

bcachefs: Correctly initialize bkey_cached->lock

We need to use the right class for some assertions to work correctly.

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

diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c
index 0e87c19effeb3..cf41926b7f8e1 100644
--- a/fs/bcachefs/btree_key_cache.c
+++ b/fs/bcachefs/btree_key_cache.c
@@ -181,7 +181,7 @@ bkey_cached_alloc(struct btree_key_cache *c)
 	ck = kmem_cache_alloc(bch2_key_cache, GFP_NOFS|__GFP_ZERO);
 	if (likely(ck)) {
 		INIT_LIST_HEAD(&ck->list);
-		six_lock_init(&ck->c.lock);
+		__six_lock_init(&ck->c.lock, "b->c.lock", &bch2_btree_node_lock_key);
 		lockdep_set_novalidate_class(&ck->c.lock);
 		BUG_ON(!six_trylock_intent(&ck->c.lock));
 		BUG_ON(!six_trylock_write(&ck->c.lock));