1 files changed, 9 insertions, 51 deletions

diff --git a/libbcache/debug.c b/libbcache/debug.c
index 1be2e607..39f5550e 100644
--- a/libbcache/debug.c
+++ b/libbcache/debug.c
@@ -46,6 +46,9 @@ void __bch_btree_verify(struct cache_set *c, struct btree *b)
 	struct bio *bio;
 	struct closure cl;
 
+	if (c->opts.nochanges)
+		return;
+
 	closure_init_stack(&cl);
 
 	btree_node_io_lock(b);
@@ -296,55 +299,6 @@ static const struct file_operations btree_debug_ops = {
 	.read		= bch_read_btree,
 };
 
-static int print_btree_node(struct dump_iter *i, struct btree *b)
-{
-	const struct bkey_format *f = &b->format;
-	struct bset_stats stats;
-
-	memset(&stats, 0, sizeof(stats));
-
-	bch_btree_keys_stats(b, &stats);
-
-	i->bytes = scnprintf(i->buf, sizeof(i->buf),
-			     "l %u %llu:%llu - %llu:%llu:\n"
-			     "    format: u64s %u fields %u %u %u %u %u\n"
-			     "    unpack fn len: %u\n"
-			     "    bytes used %zu/%zu (%zu%% full)\n"
-			     "    sib u64s: %u, %u (merge threshold %zu)\n"
-			     "    nr packed keys %u\n"
-			     "    nr unpacked keys %u\n"
-			     "    floats %zu\n"
-			     "    failed unpacked %zu\n"
-			     "    failed prev %zu\n"
-			     "    failed overflow %zu\n",
-			     b->level,
-			     b->data->min_key.inode,
-			     b->data->min_key.offset,
-			     b->data->max_key.inode,
-			     b->data->max_key.offset,
-			     f->key_u64s,
-			     f->bits_per_field[0],
-			     f->bits_per_field[1],
-			     f->bits_per_field[2],
-			     f->bits_per_field[3],
-			     f->bits_per_field[4],
-			     b->unpack_fn_len,
-			     b->nr.live_u64s * sizeof(u64),
-			     btree_bytes(i->c) - sizeof(struct btree_node),
-			     b->nr.live_u64s * 100 / btree_max_u64s(i->c),
-			     b->sib_u64s[0],
-			     b->sib_u64s[1],
-			     BTREE_FOREGROUND_MERGE_THRESHOLD(i->c),
-			     b->nr.packed_keys,
-			     b->nr.unpacked_keys,
-			     stats.floats,
-			     stats.failed_unpacked,
-			     stats.failed_prev,
-			     stats.failed_overflow);
-
-	return flush_buf(i);
-}
-
 static ssize_t bch_read_btree_formats(struct file *file, char __user *buf,
 				      size_t size, loff_t *ppos)
 {
@@ -365,7 +319,9 @@ static ssize_t bch_read_btree_formats(struct file *file, char __user *buf,
 		return i->ret;
 
 	for_each_btree_node(&iter, i->c, i->id, i->from, 0, b) {
-		err = print_btree_node(i, b);
+		i->bytes = bch_print_btree_node(i->c, b, i->buf,
+						sizeof(i->buf));
+		err = flush_buf(i);
 		if (err)
 			break;
 
@@ -421,7 +377,9 @@ static ssize_t bch_read_bfloat_failed(struct file *file, char __user *buf,
 		struct bkey_packed *_k = bch_btree_node_iter_peek(node_iter, b);
 
 		if (iter.nodes[0] != prev_node) {
-			err = print_btree_node(i, iter.nodes[0]);
+			i->bytes = bch_print_btree_node(i->c, b, i->buf,
+							sizeof(i->buf));
+			err = flush_buf(i);
 			if (err)
 				break;
 		}