From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 26 Sep 2023 21:11:23 +0000 (-0400)
Subject: bcachefs: Fix looping around bch2_propagate_key_to_snapshot_leaves()
X-Git-Tag: v6.7-rc1~201^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d281701b00fc857755cd0fc08a415a694d5f49c0;p=thirdparty%2Flinux.git

bcachefs: Fix looping around bch2_propagate_key_to_snapshot_leaves()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/snapshot.c b/fs/bcachefs/snapshot.c
index cdf9eda2ee028..3ecc17b8d6fca 100644
--- a/fs/bcachefs/snapshot.c
+++ b/fs/bcachefs/snapshot.c
@@ -1636,9 +1636,15 @@ int bch2_propagate_key_to_snapshot_leaves(struct btree_trans *trans,
 		if (!bch2_snapshot_is_ancestor(c, id, k.k->p.snapshot) ||
 		    !bch2_snapshot_is_leaf(c, id))
 			continue;
+again:
+		ret =   btree_trans_too_many_iters(trans) ?:
+			bch2_propagate_key_to_snapshot_leaf(trans, btree, k, id, new_min_pos) ?:
+			bch2_trans_commit(trans, NULL, NULL, 0);
+		if (ret && bch2_err_matches(ret, BCH_ERR_transaction_restart)) {
+			bch2_trans_begin(trans);
+			goto again;
+		}
 
-		ret = commit_do(trans, NULL, NULL, 0,
-				bch2_propagate_key_to_snapshot_leaf(trans, btree, k, id, new_min_pos));
 		if (ret)
 			break;
 	}