Update bcachefs sources to c3e4d892b77b mean and variance: Promote to lib/math

[bcachefs-tools-debian] / libbcachefs / btree_iter.h

diff --git a/libbcachefs/btree_iter.h b/libbcachefs/btree_iter.h
index a4fec7cce911cb2878ed6ee181a8162bb057c0b0..75beb183183d7e849b10b25c36d0dcd20d1c0112 100644 (file)
--- a/libbcachefs/btree_iter.h
+++ b/libbcachefs/btree_iter.h
@@ -627,12 +627,12 @@ static inline struct bkey_s_c bch2_btree_iter_peek_upto_type(struct btree_iter *
        return bch2_btree_iter_peek_slot(iter);
 }
 
+int __bch2_btree_trans_too_many_iters(struct btree_trans *);
+
 static inline int btree_trans_too_many_iters(struct btree_trans *trans)
 {
-       if (hweight64(trans->paths_allocated) > BTREE_ITER_MAX - 8) {
-               trace_and_count(trans->c, trans_restart_too_many_iters, trans, _THIS_IP_);
-               return btree_trans_restart(trans, BCH_ERR_transaction_restart_too_many_iters);
-       }
+       if (hweight64(trans->paths_allocated) > BTREE_ITER_MAX - 8)
+               return __bch2_btree_trans_too_many_iters(trans);
 
        return 0;
 }