commit 700c25b32a776a70849c025d898ba1a7431279e4
author Kent Overstreet <kent.overstreet@gmail.com> Sat Jul 24 20:24:10 2021 -0400
committer Kent Overstreet <kent.overstreet@linux.dev> Sun Oct 22 17:09:09 2023 -0400
tree 89fbf0860e64ddbdd2e54ac70a3358fe5ac3ca0f
parent 8b3e9bd65f61dde939538452cbb2a608bc562d34

bcachefs: Use bch2_trans_begin() more consistently

Upcoming patch will require that a transaction restart is always
immediately followed by bch2_trans_begin().

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

fs/bcachefs/move.c

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index 7dea663..9a423a3 100644
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -83,7 +83,7 @@ int bch2_migrate_index_update(struct bch_write_op *op)
 		bool extending = false, should_check_enospc;
 		s64 i_sectors_delta = 0, disk_sectors_delta = 0;
 
-		bch2_trans_reset(&trans, 0);
+		bch2_trans_begin(&trans);
 
 		k = bch2_btree_iter_peek_slot(iter);
 		ret = bkey_err(k);
@@ -597,6 +597,8 @@ static int __bch2_move_data(struct bch_fs *c,
 			}
 		} while (delay);
 
+		bch2_trans_begin(&trans);
+
 		k = bch2_btree_iter_peek(iter);
 
 		stats->pos = iter->pos;
@@ -652,8 +654,7 @@ static int __bch2_move_data(struct bch_fs *c,
 					data_cmd, data_opts);
 		if (ret2) {
 			if (ret2 == -EINTR) {
-				bch2_trans_reset(&trans, 0);
-				bch2_trans_cond_resched(&trans);
+				bch2_trans_begin(&trans);
 				continue;
 			}