From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Wed, 28 Jul 2021 02:32:05 +0000 (-0400)
Subject: bcachefs: traverse_all() shouldn't be restarting the transaction
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0d32711ef65511ff52b5c42e5618a6e83b406cad;p=linux.git

bcachefs: traverse_all() shouldn't be restarting the transaction

We're only called by bch2_trans_begin() now.

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

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 929bf20c1029f..d1a03fdba9ce1 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1335,15 +1335,6 @@ retry_all:
 		if (ret)
 			goto retry_all;
 	}
-
-	if (hweight64(trans->iters_live) > 1)
-		ret = btree_trans_restart(trans);
-	else
-		trans_for_each_iter(trans, iter)
-			if (iter->flags & BTREE_ITER_KEEP_UNTIL_COMMIT) {
-				ret = btree_trans_restart(trans);
-				break;
-			}
 out:
 	bch2_btree_cache_cannibalize_unlock(c);