Update bcachefs sources to 95ff72a6c1 fixup! mm: Centralize & improve oom reporting...

[bcachefs-tools-debian] / libbcachefs / btree_gc.c

diff --git a/libbcachefs/btree_gc.c b/libbcachefs/btree_gc.c
index 0bc7896cdda6d2e9908d10ff212d621449623a77..0e2c8745cdf81d53af5157b96c57b6bb4f2ac231 100644 (file)
--- a/libbcachefs/btree_gc.c
+++ b/libbcachefs/btree_gc.c
@@ -395,6 +395,7 @@ again:
                        bch2_btree_node_evict(c, cur_k.k);
                        ret = bch2_journal_key_delete(c, b->c.btree_id,
                                                      b->c.level, cur_k.k->k.p);
+                       cur = NULL;
                        if (ret)
                                break;
                        continue;
@@ -413,6 +414,7 @@ again:
                        bch2_btree_node_evict(c, cur_k.k);
                        ret = bch2_journal_key_delete(c, b->c.btree_id,
                                                      b->c.level, cur_k.k->k.p);
+                       cur = NULL;
                        if (ret)
                                break;
                        continue;
@@ -849,10 +851,7 @@ static int bch2_gc_btree(struct btree_trans *trans, enum btree_id btree_id,
        struct bch_fs *c = trans->c;
        struct btree_iter iter;
        struct btree *b;
-       unsigned depth = metadata_only                  ? 1
-               : bch2_expensive_debug_checks           ? 0
-               : !btree_node_type_needs_gc(btree_id)   ? 1
-               : 0;
+       unsigned depth = metadata_only ? 1 : 0;
        int ret = 0;
 
        gc_pos_set(c, gc_pos_btree(btree_id, POS_MIN, 0));
@@ -995,10 +994,7 @@ static int bch2_gc_btree_init(struct btree_trans *trans,
 {
        struct bch_fs *c = trans->c;
        struct btree *b;
-       unsigned target_depth = metadata_only           ? 1
-               : bch2_expensive_debug_checks           ? 0
-               : !btree_node_type_needs_gc(btree_id)   ? 1
-               : 0;
+       unsigned target_depth = metadata_only ? 1 : 0;
        struct printbuf buf = PRINTBUF;
        int ret = 0;