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>

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 2a84685f4e6088b4eb778b6cd2349906c50f4bce..4a3f39a619a1e3cd9ac0099e410e19ed70b0d06b 100644 (file)
--- 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) {