bcache: Convert btree_iter to struct btree_keys

More work to disentangle bset.c from struct btree

Signed-off-by: Kent Overstreet <kmo@daterainc.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c
index 8acc18af07c1..3de27e2a4e07 100644
--- a/drivers/md/bcache/debug.c
+++ b/drivers/md/bcache/debug.c
@@ -246,7 +246,7 @@ int __bch_count_data(struct btree *b)
         struct bkey *k;
 
         if (!b->level)
-                for_each_key(b, k, &iter)
+                for_each_key(&b->keys, k, &iter)
                         ret += KEY_SIZE(k);
         return ret;
 }
@@ -258,7 +258,7 @@ void __bch_check_keys(struct btree *b, const char *fmt, ...)
         struct btree_iter iter;
         const char *err;
 
-        for_each_key(b, k, &iter) {
+        for_each_key(&b->keys, k, &iter) {
                 if (!b->level) {
                         err = "Keys out of order";
                         if (p && bkey_cmp(&START_KEY(p), &START_KEY(k)) > 0)
@@ -298,6 +298,7 @@ bug:
 
 void bch_btree_iter_next_check(struct btree_iter *iter)
 {
+#if 0
         struct bkey *k = iter->data->k, *next = bkey_next(k);
 
         if (next < iter->data->end &&
@@ -305,6 +306,7 @@ void bch_btree_iter_next_check(struct btree_iter *iter)
                 bch_dump_bucket(iter->b);
                 panic("Key skipped backwards\n");
         }
+#endif
 }
 
 #endif