bcachefs: Fix locking assert

We now track whether a transaction is locked, and verify that we don't
have nodes locked when the transaction isn't locked; reorder relocks to
not pop the new assert.

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 75f5e6fe46349f0ed0a2d3b3b4611883d69b6700..34056aaece009e80c1ef2bd39d304f8b185ce68d 100644 (file)
--- a/fs/bcachefs/btree_key_cache.c
+++ b/fs/bcachefs/btree_key_cache.c
@@ -424,16 +424,16 @@ static int btree_key_cache_fill(struct btree_trans *trans,
                                goto err;
                        }
 
-                       if (!bch2_btree_node_relock(trans, ck_path, 0)) {
+                       ret = bch2_trans_relock(trans);
+                       if (ret) {
                                kfree(new_k);
-                               trace_and_count(trans->c, trans_restart_relock_key_cache_fill, trans, _THIS_IP_, ck_path);
-                               ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_fill);
                                goto err;
                        }
 
-                       ret = bch2_trans_relock(trans);
-                       if (ret) {
+                       if (!bch2_btree_node_relock(trans, ck_path, 0)) {
                                kfree(new_k);
+                               trace_and_count(trans->c, trans_restart_relock_key_cache_fill, trans, _THIS_IP_, ck_path);
+                               ret = btree_trans_restart(trans, BCH_ERR_transaction_restart_key_cache_fill);
                                goto err;
                        }
                }