From f4ccfe07e20e52a5f6ace9ef995bca1c07a70fac Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 22 Aug 2021 12:56:56 -0400 Subject: [PATCH] bcachefs: Fix unhandled transaction restart in bch2_gc_btree_gens() This fixes https://github.com/koverstreet/bcachefs/issues/305 Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_gc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c index 2a84685f4e608..4a3f39a619a1e 100644 --- a/fs/bcachefs/btree_gc.c +++ b/fs/bcachefs/btree_gc.c @@ -1736,8 +1736,14 @@ static int bch2_gc_btree_gens(struct bch_fs *c, enum btree_id btree_id) BTREE_ITER_ALL_SNAPSHOTS); while ((bch2_trans_begin(&trans), - k = bch2_btree_iter_peek(iter)).k && - !(ret = bkey_err(k))) { + k = bch2_btree_iter_peek(iter)).k) { + ret = bkey_err(k); + + if (ret == -EINTR) + continue; + if (ret) + break; + c->gc_gens_pos = iter->pos; if (gc_btree_gens_key(c, k) && !commit_err) { -- 2.30.2