From: Kent Overstreet Date: Mon, 9 Mar 2020 20:15:54 +0000 (-0400) Subject: bcachefs: Traverse iterator in journal replay X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f6d0368e06be2c889a4ce1097e20606cededd775;p=linux.git 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 Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 3b9c20cf389ab..712a6b1fd9685 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,