diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-08-22 12:56:56 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:10 -0400 |
| commit | f4ccfe07e20e52a5f6ace9ef995bca1c07a70fac (patch) | |
| tree | 5859a93be7a807ec74e71fb3bd42daf80b4c0787 /fs/bcachefs | |
| parent | 8dd6ed9451894e2168328e2203d227303b472ca3 (diff) | |
bcachefs: Fix unhandled transaction restart in bch2_gc_btree_gens()
This fixes https://github.com/koverstreet/bcachefs/issues/305
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs')
| -rw-r--r-- | fs/bcachefs/btree_gc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c index 2a84685f4e60..4a3f39a619a1 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) { |