diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-28 17:26:38 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-28 17:26:50 -0400 |
| commit | f06b01e9eacca7cd23679ee92f3d082c9352263f (patch) | |
| tree | 1c3ab7f5881ca532228e04761ac030c2a109675f /libbcachefs/move.c | |
| parent | 308d7adcc5ded346e86a2e9c6419bc3b6b5f3e55 (diff) | |
Update bcachefs sources to b964c6cba8 bcachefs: Change lockrestart_do() to always call bch2_trans_begin()
Diffstat (limited to 'libbcachefs/move.c')
| -rw-r--r-- | libbcachefs/move.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libbcachefs/move.c b/libbcachefs/move.c index 80a54e17..ee0f155f 100644 --- a/libbcachefs/move.c +++ b/libbcachefs/move.c @@ -84,7 +84,7 @@ static 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); @@ -191,7 +191,7 @@ nomatch: } atomic_long_inc(&c->extent_migrate_raced); trace_move_race(&new->k); - bch2_btree_iter_next_slot(iter); + bch2_btree_iter_advance(iter); goto next; } out: @@ -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; } |