From 62d5bd955fd81320d1e03fdebb4342ee14df1d1f Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 19 Dec 2021 18:59:22 -0500 Subject: bcachefs: Kill bch2_sort_repack_merge() The main function of bch2_sort_repack_merge() was to call .key_normalize on every key, which drops stale (cached) pointers - it hasn't actually merged extents in quite some time. But bch2_gc_gens() now works on individual keys - we used to gc old gens by rewriting entire btree nodes. With that gone, there's no need for internal btree code to be calling .key_normalize anymore. Signed-off-by: Kent Overstreet --- fs/bcachefs/bkey_sort.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'fs/bcachefs/bkey_sort.h') diff --git a/fs/bcachefs/bkey_sort.h b/fs/bcachefs/bkey_sort.h index 1059996dac78..79cf11d1b4e7 100644 --- a/fs/bcachefs/bkey_sort.h +++ b/fs/bcachefs/bkey_sort.h @@ -37,11 +37,6 @@ struct btree_nr_keys bch2_sort_repack(struct bset *, struct btree *, struct btree_node_iter *, struct bkey_format *, bool); -struct btree_nr_keys -bch2_sort_repack_merge(struct bch_fs *, - struct bset *, struct btree *, - struct btree_node_iter *, - struct bkey_format *, bool); unsigned bch2_sort_keys(struct bkey_packed *, struct sort_iter *, bool); -- cgit v1.2.3-58-ga151