bcachefs: Kill gc_pos_btree_node()

gc_pos is now based on keys, not nodes, for invariantness w.r.t. splits
and merges

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_gc.h b/fs/bcachefs/btree_gc.h
index 1bdf841dc44b8aa3774f8b9eaab5872ee995c8e1..7f8855420c19f3fef72248f727bcf769ecd2b171 100644 (file)
--- a/fs/bcachefs/btree_gc.h
+++ b/fs/bcachefs/btree_gc.h
@@ -47,15 +47,6 @@ static inline struct gc_pos gc_pos_btree(enum btree_id btree, unsigned level,
        };
 }
 
-/*
- * GC position of the pointers within a btree node: note, _not_ for &b->key
- * itself, that lives in the parent node:
- */
-static inline struct gc_pos gc_pos_btree_node(struct btree *b)
-{
-       return gc_pos_btree(b->c.btree_id, b->c.level, b->key.k.p);
-}
-
 static inline int gc_btree_order(enum btree_id btree)
 {
        if (btree == BTREE_ID_alloc)

diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c
index 843558d968873ba9aa1aad1233029c056b7bfe24..8ab85f212f60a8c34e20a60e2595d3b1f124d6fb 100644 (file)
--- a/fs/bcachefs/btree_trans_commit.c
+++ b/fs/bcachefs/btree_trans_commit.c
@@ -599,7 +599,7 @@ static noinline int bch2_trans_commit_run_gc_triggers(struct btree_trans *trans)
 {
        trans_for_each_update(trans, i)
                if (btree_node_type_has_triggers(i->bkey_type) &&
-                   gc_visited(trans->c, gc_pos_btree_node(insert_l(trans, i)->b))) {
+                   gc_visited(trans->c, gc_pos_btree(i->btree_id, i->level, i->k->k.p))) {
                        int ret = run_one_mem_trigger(trans, i, i->flags|BTREE_TRIGGER_gc);
                        if (ret)
                                return ret;