Update bcachefs sources to 4c58f10d48 bcachefs: More general fix for transaction paths overflow

This commit is contained in:
Kent Overstreet 2021-10-25 18:32:51 -04:00
parent 1ce6454cfe
commit 72a9f1015d
2 changed files with 4 additions and 3 deletions

View File

@ -1 +1 @@
cdf89ca564aa1916f16a58a06a395bfb3a86d302
4c58f10d4897ff15849e6c028a9f665e03b8d4c0

View File

@ -303,8 +303,9 @@ __bch2_btree_iter_peek_and_restart(struct btree_trans *trans,
{
struct bkey_s_c k;
while (k = __bch2_btree_iter_peek(iter, flags),
bkey_err(k) == -EINTR)
while ((hweight64(trans->paths_allocated) > BTREE_ITER_MAX / 2) ||
(k = __bch2_btree_iter_peek(iter, flags),
bkey_err(k) == -EINTR))
bch2_trans_begin(trans);
return k;