From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 27 Jul 2021 22:01:52 +0000 (-0400)
Subject: bcachefs: bch2_btree_iter_traverse() shouldn't normally call traverse_all()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b4e09b351be7085cada5c08c1eabee5f0eb498b0;p=linux.git

bcachefs: bch2_btree_iter_traverse() shouldn't normally call traverse_all()

If there's more than one iterator in the btree_trans, it's requried to
call bch2_trans_begin() to handle transaction restarts.

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

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 816b9369c833e..ac7a7c18ebe24 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1476,8 +1476,10 @@ static int __must_check __bch2_btree_iter_traverse(struct btree_iter *iter)
 
 	ret =   bch2_trans_cond_resched(trans) ?:
 		btree_iter_traverse_one(iter, _RET_IP_);
-	if (unlikely(ret))
+	if (unlikely(ret) && hweight64(trans->iters_linked) == 1) {
 		ret = __btree_iter_traverse_all(trans, ret, _RET_IP_);
+		BUG_ON(ret == -EINTR);
+	}
 
 	return ret;
 }