Update bcachefs sources to 6628827a8707 bcachefs: Skip deleted members in member_to_t...

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

diff --git a/libbcachefs/bkey_sort.h b/libbcachefs/bkey_sort.h
index 397009181eaee233d0cf820d9cd2a775d87e76da..7c0f0b160f18533302ebc0e5568c7599f2f6cffd 100644 (file)
--- a/libbcachefs/bkey_sort.h
+++ b/libbcachefs/bkey_sort.h
@@ -2,68 +2,53 @@
 #ifndef _BCACHEFS_BKEY_SORT_H
 #define _BCACHEFS_BKEY_SORT_H
 
-struct btree_node_iter_large {
-       u16             used;
-
-       struct btree_node_iter_set data[MAX_BSETS];
-};
-
-void bch2_btree_node_iter_large_push(struct btree_node_iter_large *,
-                                    struct btree *,
-                                    const struct bkey_packed *,
-                                    const struct bkey_packed *);
-
 struct sort_iter {
-       struct btree    *b;
+       struct btree            *b;
        unsigned                used;
+       unsigned                size;
 
        struct sort_iter_set {
                struct bkey_packed *k, *end;
-       } data[MAX_BSETS + 1];
+       } data[];
 };
 
-static inline void sort_iter_init(struct sort_iter *iter, struct btree *b)
+static inline void sort_iter_init(struct sort_iter *iter, struct btree *b, unsigned size)
 {
-       memset(iter, 0, sizeof(*iter));
        iter->b = b;
+       iter->used = 0;
+       iter->size = size;
+}
+
+struct sort_iter_stack {
+       struct sort_iter        iter;
+       struct sort_iter_set    sets[MAX_BSETS + 1];
+};
+
+static inline void sort_iter_stack_init(struct sort_iter_stack *iter, struct btree *b)
+{
+       sort_iter_init(&iter->iter, b, ARRAY_SIZE(iter->sets));
 }
 
 static inline void sort_iter_add(struct sort_iter *iter,
                                 struct bkey_packed *k,
                                 struct bkey_packed *end)
 {
-       BUG_ON(iter->used >= ARRAY_SIZE(iter->data));
+       BUG_ON(iter->used >= iter->size);
 
        if (k != end)
                iter->data[iter->used++] = (struct sort_iter_set) { k, end };
 }
 
 struct btree_nr_keys
-bch2_key_sort_fix_overlapping(struct bset *, struct btree *,
-                             struct btree_node_iter_large *);
-struct btree_nr_keys
-bch2_extent_sort_fix_overlapping(struct bch_fs *, struct bset *,
-                                struct btree *,
-                                struct btree_node_iter_large *);
+bch2_key_sort_fix_overlapping(struct bch_fs *, struct bset *,
+                             struct sort_iter *);
 
 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);
-unsigned bch2_sort_extents(struct bkey_packed *,
-                          struct sort_iter *, bool);
-
-unsigned bch2_sort_key_whiteouts(struct bkey_packed *,
-                                struct sort_iter *);
-unsigned bch2_sort_extent_whiteouts(struct bkey_packed *,
-                                   struct sort_iter *);
 
 #endif /* _BCACHEFS_BKEY_SORT_H */