diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-03-09 16:15:54 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-03-09 16:24:53 -0400 |
| commit | 7e07e19c29a31d2c719eb16f7e9061ad5aba5099 (patch) | |
| tree | a0bd935bf9e3253766b34d926624ca8dd2387b02 | |
| parent | d051feef0d3838b0ce7341b334b3da9baed116f3 (diff) | |
bcachefs: Traverse iterator in journal replay
This fixes a bug where we end up spinning in journal replay - in theory
this shouldn't be necessary though, transaction reset should be
re-traversing all iterators.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/recovery.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 3b9c20cf389a..712a6b1fd968 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -417,15 +417,17 @@ static int __bch2_journal_replay_key(struct btree_trans *trans, enum btree_id id, struct bkey_i *k) { struct btree_iter *iter; + int ret; iter = bch2_trans_get_iter(trans, id, bkey_start_pos(&k->k), BTREE_ITER_INTENT); if (IS_ERR(iter)) return PTR_ERR(iter); - bch2_trans_update(trans, iter, k, BTREE_TRIGGER_NORUN); + ret = bch2_btree_iter_traverse(iter) ?: + bch2_trans_update(trans, iter, k, BTREE_TRIGGER_NORUN); bch2_trans_iter_put(trans, iter); - return 0; + return ret; } static int bch2_journal_replay_key(struct bch_fs *c, enum btree_id id, |