Update bcachefs sources to 25de2b00dc bcachefs: Change check for invalid key types

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

diff --git a/libbcachefs/btree_gc.h b/libbcachefs/btree_gc.h
index 9e067deb8c0f1be9329df32893ab848c093d8378..95d803b5743de5bb9e8bc5d58a868e9b795c27cf 100644 (file)
--- a/libbcachefs/btree_gc.h
+++ b/libbcachefs/btree_gc.h
@@ -1,13 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_BTREE_GC_H
 #define _BCACHEFS_BTREE_GC_H
 
 #include "btree_types.h"
 
-void bch2_coalesce(struct bch_fs *);
-int bch2_gc(struct bch_fs *, struct list_head *, bool, bool);
+int bch2_gc(struct bch_fs *, bool, bool);
+int bch2_gc_gens(struct bch_fs *);
 void bch2_gc_thread_stop(struct bch_fs *);
 int bch2_gc_thread_start(struct bch_fs *);
-void bch2_mark_dev_superblock(struct bch_fs *, struct bch_dev *, unsigned);
 
 /*
  * For concurrent mark and sweep (with other index updates), we define a total
@@ -42,19 +42,15 @@ static inline struct gc_pos gc_phase(enum gc_phase phase)
 
 static inline int gc_pos_cmp(struct gc_pos l, struct gc_pos r)
 {
-       if (l.phase != r.phase)
-               return l.phase < r.phase ? -1 : 1;
-       if (bkey_cmp(l.pos, r.pos))
-               return bkey_cmp(l.pos, r.pos);
-       if (l.level != r.level)
-               return l.level < r.level ? -1 : 1;
-       return 0;
+       return  cmp_int(l.phase, r.phase) ?:
+               bpos_cmp(l.pos, r.pos) ?:
+               cmp_int(l.level, r.level);
 }
 
 static inline enum gc_phase btree_id_to_gc_phase(enum btree_id id)
 {
        switch (id) {
-#define x(n, v, s) case BTREE_ID_##n: return GC_PHASE_BTREE_##n;
+#define x(name, v) case BTREE_ID_##name: return GC_PHASE_BTREE_##name;
        BCH_BTREE_IDS()
 #undef x
        default:
@@ -78,7 +74,7 @@ static inline struct gc_pos gc_pos_btree(enum btree_id id,
  */
 static inline struct gc_pos gc_pos_btree_node(struct btree *b)
 {
-       return gc_pos_btree(b->btree_id, b->key.k.p, b->level);
+       return gc_pos_btree(b->c.btree_id, b->key.k.p, b->c.level);
 }
 
 /*
@@ -90,15 +86,7 @@ static inline struct gc_pos gc_pos_btree_node(struct btree *b)
  */
 static inline struct gc_pos gc_pos_btree_root(enum btree_id id)
 {
-       return gc_pos_btree(id, POS_MAX, BTREE_MAX_DEPTH);
-}
-
-static inline struct gc_pos gc_pos_alloc(struct bch_fs *c, struct open_bucket *ob)
-{
-       return (struct gc_pos) {
-               .phase  = GC_PHASE_ALLOC,
-               .pos    = POS(ob ? ob - c->open_buckets : 0, 0),
-       };
+       return gc_pos_btree(id, SPOS_MAX, BTREE_MAX_DEPTH);
 }
 
 static inline bool gc_visited(struct bch_fs *c, struct gc_pos pos)
@@ -114,4 +102,11 @@ static inline bool gc_visited(struct bch_fs *c, struct gc_pos pos)
        return ret;
 }
 
+static inline void bch2_do_gc_gens(struct bch_fs *c)
+{
+       atomic_inc(&c->kick_gc);
+       if (c->gc_thread)
+               wake_up_process(c->gc_thread);
+}
+
 #endif /* _BCACHEFS_BTREE_GC_H */