Update bcachefs sources to 0e765bc37c bcachefs: foreground merging of interior btree...

[bcachefs-tools-debian] / libbcachefs / debug.c

diff --git a/libbcachefs/debug.c b/libbcachefs/debug.c
index bf160e0b93daf2a19f32d27661700258d14610f9..00e0de167b322e67c5dd1db0d1edb59e2b902a43 100644 (file)
--- a/libbcachefs/debug.c
+++ b/libbcachefs/debug.c
@@ -54,28 +54,28 @@ void __bch2_btree_verify(struct bch_fs *c, struct btree *b)
        v->btree_id     = b->btree_id;
        bch2_btree_keys_init(v, &c->expensive_debug_checks);
 
-       pick = bch2_btree_pick_ptr(c, b);
+       pick = bch2_btree_pick_ptr(c, b, NULL);
        if (IS_ERR_OR_NULL(pick.ca))
                return;
 
-       bio = bio_alloc_bioset(GFP_NOIO, btree_pages(c), &c->btree_read_bio);
-       bio->bi_bdev            = pick.ca->disk_sb.bdev;
+       bio = bio_alloc_bioset(GFP_NOIO, btree_pages(c), &c->btree_bio);
+       bio_set_dev(bio, pick.ca->disk_sb.bdev);
+       bio->bi_opf             = REQ_OP_READ|REQ_META;
        bio->bi_iter.bi_sector  = pick.ptr.offset;
        bio->bi_iter.bi_size    = btree_bytes(c);
-       bio_set_op_attrs(bio, REQ_OP_READ, REQ_META|READ_SYNC);
        bch2_bio_map(bio, n_sorted);
 
        submit_bio_wait(bio);
 
        bio_put(bio);
+       percpu_ref_put(&pick.ca->io_ref);
 
        memcpy(n_ondisk, n_sorted, btree_bytes(c));
 
-       bch2_btree_node_read_done(c, v, pick.ca, &pick.ptr);
-       n_sorted = c->verify_data->data;
-
-       percpu_ref_put(&pick.ca->io_ref);
+       if (bch2_btree_node_read_done(c, v, false))
+               goto out;
 
+       n_sorted = c->verify_data->data;
        sorted = &n_sorted->keys;
        inmemory = &n_inmemory->keys;
 
@@ -127,7 +127,7 @@ void __bch2_btree_verify(struct bch_fs *c, struct btree *b)
                console_unlock();
                panic("verify failed at %u\n", j);
        }
-
+out:
        mutex_unlock(&c->verify_lock);
        btree_node_io_unlock(b);
 }
@@ -212,10 +212,10 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf,
        if (!i->size)
                return i->ret;
 
-       bch2_btree_iter_init(&iter, i->c, i->id, i->from);
+       for_each_btree_key(&iter, i->c, i->id, i->from,
+                          BTREE_ITER_PREFETCH, k) {
+               i->from = iter.pos;
 
-       while ((k = bch2_btree_iter_peek(&iter)).k &&
-              !(err = btree_iter_err(k))) {
                bch2_bkey_val_to_text(i->c, bkey_type(0, i->id),
                                     i->buf, sizeof(i->buf), k);
                i->bytes = strlen(i->buf);
@@ -223,9 +223,6 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf,
                i->buf[i->bytes] = '\n';
                i->bytes++;
 
-               bch2_btree_iter_advance_pos(&iter);
-               i->from = iter.pos;
-
                err = flush_buf(i);
                if (err)
                        break;
@@ -233,7 +230,7 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf,
                if (!i->size)
                        break;
        }
-       bch2_btree_iter_unlock(&iter);
+       err = bch2_btree_iter_unlock(&iter) ?: err;
 
        return err < 0 ? err : i->ret;
 }
@@ -314,30 +311,31 @@ static ssize_t bch2_read_bfloat_failed(struct file *file, char __user *buf,
        if (!i->size)
                return i->ret;
 
-       bch2_btree_iter_init(&iter, i->c, i->id, i->from);
+       bch2_btree_iter_init(&iter, i->c, i->id, i->from, BTREE_ITER_PREFETCH);
 
        while ((k = bch2_btree_iter_peek(&iter)).k &&
               !(err = btree_iter_err(k))) {
-               struct btree *b = iter.nodes[0];
-               struct btree_node_iter *node_iter = &iter.node_iters[0];
-               struct bkey_packed *_k = bch2_btree_node_iter_peek(node_iter, b);
+               struct btree_iter_level *l = &iter.l[0];
+               struct bkey_packed *_k =
+                       bch2_btree_node_iter_peek(&l->iter, l->b);
 
-               if (iter.nodes[0] != prev_node) {
-                       i->bytes = bch2_print_btree_node(i->c, b, i->buf,
+               if (l->b != prev_node) {
+                       i->bytes = bch2_print_btree_node(i->c, l->b, i->buf,
                                                        sizeof(i->buf));
                        err = flush_buf(i);
                        if (err)
                                break;
                }
-               prev_node = iter.nodes[0];
+               prev_node = l->b;
 
-               i->bytes = bch2_bkey_print_bfloat(b, _k, i->buf, sizeof(i->buf));
+               i->bytes = bch2_bkey_print_bfloat(l->b, _k, i->buf,
+                                                 sizeof(i->buf));
 
                err = flush_buf(i);
                if (err)
                        break;
 
-               bch2_btree_iter_advance_pos(&iter);
+               bch2_btree_iter_next(&iter);
                i->from = iter.pos;
 
                err = flush_buf(i);