bcachefs: Fix a deadlock

btree_node_lock_increment() was incorrectly skipping over the current
iter when checking if we should increment a node we already have locked.

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

diff --git a/fs/bcachefs/btree_locking.h b/fs/bcachefs/btree_locking.h
index a164924ca656e51b8f865a0b5f273b9d1ad3d4b1..3b199e2e1e9e97e949e025fe96aa2e5ee1190757 100644 (file)
--- a/fs/bcachefs/btree_locking.h
+++ b/fs/bcachefs/btree_locking.h
@@ -164,8 +164,7 @@ static inline bool btree_node_lock_increment(struct btree_iter *iter,
        struct btree_iter *linked;
 
        trans_for_each_iter(iter->trans, linked)
-               if (linked != iter &&
-                   linked->l[level].b == b &&
+               if (linked->l[level].b == b &&
                    btree_node_locked_type(linked, level) >= want) {
                        six_lock_increment(&b->c.lock, want);
                        return true;