diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2013-11-11 18:38:51 -0800 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2014-01-08 13:05:13 -0800 |
| commit | 89ebb4a28ba9efb5c9b18ba552e784021957b14a (patch) | |
| tree | 7f649258fe76af99c63cb81c421c704a418abfe9 /drivers/md/bcache/bset.h | |
| parent | dc9d98d621bdce0552997200ce855659875a5c9f (diff) | |
| download | linux-stable-89ebb4a28ba9efb5c9b18ba552e784021957b14a.tar.gz linux-stable-89ebb4a28ba9efb5c9b18ba552e784021957b14a.tar.bz2 linux-stable-89ebb4a28ba9efb5c9b18ba552e784021957b14a.zip | |
bcache: Convert sorting to btree_keys
More work to disentangle various code from struct btree
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bset.h')
| -rw-r--r-- | drivers/md/bcache/bset.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h index e01e69e00654..4aa199d03344 100644 --- a/drivers/md/bcache/bset.h +++ b/drivers/md/bcache/bset.h @@ -1,7 +1,9 @@ #ifndef _BCACHE_BSET_H #define _BCACHE_BSET_H -#include <linux/slab.h> +#include <linux/bcache.h> +#include <linux/kernel.h> +#include <linux/types.h> #include "util.h" /* for time_stats */ @@ -144,7 +146,6 @@ * first key in that range of bytes again. */ -struct btree; struct btree_keys; struct btree_iter; struct btree_iter_set; @@ -353,15 +354,15 @@ struct bset_sort_state { void bch_bset_sort_state_free(struct bset_sort_state *); int bch_bset_sort_state_init(struct bset_sort_state *, unsigned); -void bch_btree_sort_lazy(struct btree *, struct bset_sort_state *); -void bch_btree_sort_into(struct btree *, struct btree *, +void bch_btree_sort_lazy(struct btree_keys *, struct bset_sort_state *); +void bch_btree_sort_into(struct btree_keys *, struct btree_keys *, struct bset_sort_state *); void bch_btree_sort_and_fix_extents(struct btree_keys *, struct btree_iter *, struct bset_sort_state *); -void bch_btree_sort_partial(struct btree *, unsigned, +void bch_btree_sort_partial(struct btree_keys *, unsigned, struct bset_sort_state *); -static inline void bch_btree_sort(struct btree *b, +static inline void bch_btree_sort(struct btree_keys *b, struct bset_sort_state *state) { bch_btree_sort_partial(b, 0, state); |