Update bcachefs sources to 84505cfd37 bcachefs: Go RW before check_alloc_info()

[bcachefs-tools-debian] / libbcachefs / btree_locking.c

diff --git a/libbcachefs/btree_locking.c b/libbcachefs/btree_locking.c
index d3326e980db998f933e846d21b11ea88f925d4a2..dce2dc0cc0c555a7e34873d05d6b0cd4c14cb191 100644 (file)
--- a/libbcachefs/btree_locking.c
+++ b/libbcachefs/btree_locking.c
@@ -359,18 +359,8 @@ static inline bool btree_path_get_locks(struct btree_trans *trans,
 
                if (!(upgrade
                      ? bch2_btree_node_upgrade(trans, path, l)
-                     : bch2_btree_node_relock(trans, path, l))) {
-                       (upgrade
-                        ? trace_node_upgrade_fail
-                        : trace_node_relock_fail)(0, _RET_IP_,
-                                       path->btree_id, &path->pos,
-                                       l, path->l[l].lock_seq,
-                                       path->l[l].b,
-                                       is_btree_node(path, l)
-                                       ? path->l[l].b->c.lock.state.seq
-                                       : 0);
+                     : bch2_btree_node_relock(trans, path, l)))
                        fail_idx = l;
-               }
 
                l++;
        } while (l < path->locks_want);