From 216c9facfd7568f6b91d43784994830b235abd91 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 11 Aug 2018 19:12:05 -0400 Subject: bcachefs: Pass around bset_tree less Signed-off-by: Kent Overstreet --- fs/bcachefs/bset.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'fs/bcachefs/bset.c') diff --git a/fs/bcachefs/bset.c b/fs/bcachefs/bset.c index b95cfe7ece9a..91c6bc2c8418 100644 --- a/fs/bcachefs/bset.c +++ b/fs/bcachefs/bset.c @@ -23,16 +23,7 @@ static inline void __bch2_btree_node_iter_advance(struct btree_node_iter *, struct bset_tree *bch2_bkey_to_bset(struct btree *b, struct bkey_packed *k) { - unsigned offset = __btree_node_key_to_offset(b, k); - struct bset_tree *t; - - for_each_bset(b, t) - if (offset <= t->end_offset) { - EBUG_ON(offset < btree_bkey_first_offset(t)); - return t; - } - - BUG(); + return bch2_bkey_to_bset_inlined(b, k); } /* @@ -1117,9 +1108,10 @@ static void ro_aux_tree_fix_invalidated_key(struct btree *b, * modified, fix any auxiliary search tree by remaking all the nodes in the * auxiliary search tree that @k corresponds to */ -void bch2_bset_fix_invalidated_key(struct btree *b, struct bset_tree *t, - struct bkey_packed *k) +void bch2_bset_fix_invalidated_key(struct btree *b, struct bkey_packed *k) { + struct bset_tree *t = bch2_bkey_to_bset_inlined(b, k); + switch (bset_aux_tree_type(t)) { case BSET_NO_AUX_TREE: break; -- cgit v1.2.3