summaryrefslogtreecommitdiff
path: root/drivers/md/bcache/bset.h
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2015-02-06 14:00:44 -0800
committerKent Overstreet <kmo@daterainc.com>2015-02-12 23:44:02 -0800
commit198c35706c2c32bbc5dae99c4d6d717a2e61c3bb (patch)
tree69e09e1227e170b9f5c00c57ccdaaa75751de13f /drivers/md/bcache/bset.h
parentc47ec88aeaba5e2a5c6d3911c221d067a7dcf349 (diff)
bcache: Kill bch_btree_count_u64s()
Since we only merge extents when doing a full sort, we don't need this anymore. Change-Id: I9760c7b1b9eb0f99e127ac1935c1dd4f171eb5c1
Diffstat (limited to 'drivers/md/bcache/bset.h')
-rw-r--r--drivers/md/bcache/bset.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h
index 74112cb57959..9bf7fa4a311c 100644
--- a/drivers/md/bcache/bset.h
+++ b/drivers/md/bcache/bset.h
@@ -503,15 +503,6 @@ struct bset_stats {
void bch_btree_keys_stats(struct btree_keys *, struct bset_stats *);
-size_t bch_btree_count_u64s(struct btree_keys *);
-
-static inline void verify_nr_live_u64s(struct btree_keys *b)
-{
-#ifdef CONFIG_BCACHE_DEBUG
- BUG_ON(b->nr_live_u64s != bch_btree_count_u64s(b));
-#endif
-}
-
/* Debug stuff */
#ifdef CONFIG_BCACHE_DEBUG
@@ -519,6 +510,7 @@ static inline void verify_nr_live_u64s(struct btree_keys *b)
s64 bch_count_data(struct btree_keys *);
void bch_dump_bucket(struct btree_keys *);
void bch_btree_node_iter_verify(struct btree_keys *, struct btree_node_iter *);
+void bch_verify_nr_live_u64s(struct btree_keys *);
#else
@@ -526,6 +518,7 @@ static inline s64 bch_count_data(struct btree_keys *b) { return -1; }
static inline void bch_dump_bucket(struct btree_keys *b) {}
static inline void bch_btree_node_iter_verify(struct btree_keys *b,
struct btree_node_iter *iter) {}
+static inline void bch_verify_nr_live_u64s(struct btree_keys *b) {}
#endif