diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-05-17 01:38:57 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-05-17 02:36:19 -0400 |
| commit | ff86d4722124c300c40b85b6eb8ef2d410ab303c (patch) | |
| tree | 05e54b0bf6397ecbb5e7717a7925ac6ed2645a68 /libbcachefs/bset.h | |
| parent | 800408be11898f6d53ceecfd894cce8860fda26a (diff) | |
Update bcachefs sources to 0906b1fb49 bcachefs: fixes for 32 bit/big endian machines
Diffstat (limited to 'libbcachefs/bset.h')
| -rw-r--r-- | libbcachefs/bset.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libbcachefs/bset.h b/libbcachefs/bset.h index cc4ea5d8..153e2b3f 100644 --- a/libbcachefs/bset.h +++ b/libbcachefs/bset.h @@ -157,9 +157,6 @@ static inline bool btree_keys_expensive_checks(const struct btree *b) #endif } -struct btree_node_iter; -struct btree_node_iter_set; - enum bset_aux_tree_type { BSET_NO_AUX_TREE, BSET_RO_AUX_TREE, @@ -342,7 +339,8 @@ int bch2_btree_keys_alloc(struct btree *, unsigned, gfp_t); void bch2_btree_keys_init(struct btree *, bool *); void bch2_bset_init_first(struct btree *, struct bset *); -void bch2_bset_init_next(struct btree *, struct bset *); +void bch2_bset_init_next(struct bch_fs *, struct btree *, + struct btree_node_entry *); void bch2_bset_build_aux_tree(struct btree *, struct bset_tree *, bool); void bch2_bset_fix_invalidated_key(struct btree *, struct bset_tree *, struct bkey_packed *); @@ -420,14 +418,6 @@ static inline enum bch_extent_overlap bch2_extent_overlap(const struct bkey *k, /* Btree key iteration */ -struct btree_node_iter { - u8 is_extents; - - struct btree_node_iter_set { - u16 k, end; - } data[MAX_BSETS]; -}; - static inline void __bch2_btree_node_iter_init(struct btree_node_iter *iter, bool is_extents) { |