diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-06-08 02:51:57 +0200 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-07-15 01:00:15 +0200 |
| commit | ae4fb17e86701c55da6867ded662d1b7aef40f12 (patch) | |
| tree | f1f1c14b4957c6055a043089ba488a3e6521a071 /fs | |
| parent | bcachefs: Fix bch2_gc_accounting_done() locking (diff) | |
| download | linux-ae4fb17e86701c55da6867ded662d1b7aef40f12.tar.xz linux-ae4fb17e86701c55da6867ded662d1b7aef40f12.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/btree_gc.h | 9 | ||||
| -rw-r--r-- | fs/bcachefs/btree_trans_commit.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/fs/bcachefs/btree_gc.h b/fs/bcachefs/btree_gc.h index 1bdf841dc44b..7f8855420c19 100644 --- 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 843558d96887..8ab85f212f60 100644 --- 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; |