Update bcachefs sources to 0342eebf85 bcachefs: Improve the backpointer to missing...

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

diff --git a/libbcachefs/btree_gc.h b/libbcachefs/btree_gc.h
index b1362a9f94186e75c0e206293b782aef6ae03d06..95d803b5743de5bb9e8bc5d58a868e9b795c27cf 100644 (file)
--- a/libbcachefs/btree_gc.h
+++ b/libbcachefs/btree_gc.h
@@ -4,13 +4,10 @@
 
 #include "btree_types.h"
 
-void bch2_coalesce(struct bch_fs *);
-
-int bch2_gc(struct bch_fs *, 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
@@ -89,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)
@@ -113,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 */