Update bcachefs sources to 6f603b8d79 bcachefs: some improvements to startup messages...

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

diff --git a/libbcachefs/btree_iter.c b/libbcachefs/btree_iter.c
index 33cbc2ff5c9a1ebc99934c0ee8ff7a4594f7224c..49ddf05cc9a9522d8312c4ccff8d8aabaef485fd 100644 (file)
--- a/libbcachefs/btree_iter.c
+++ b/libbcachefs/btree_iter.c
@@ -1002,7 +1002,7 @@ retry_all:
                        goto retry_all;
        }
 
-       ret = btree_trans_has_multiple_iters(trans) ? -EINTR : 0;
+       ret = hweight64(trans->iters_live) > 1 ? -EINTR : 0;
 out:
        bch2_btree_cache_cannibalize_unlock(c);
        return ret;
@@ -1100,8 +1100,6 @@ int __must_check bch2_btree_iter_traverse(struct btree_iter *iter)
        if (unlikely(ret))
                ret = __btree_iter_traverse_all(iter->trans, iter, ret);
 
-       BUG_ON(ret == -EINTR && !btree_trans_has_multiple_iters(iter->trans));
-
        return ret;
 }