Update bcachefs sources to 1a739db0b256 bcachefs; guard against overflow in btree...

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

diff --git a/libbcachefs/debug.c b/libbcachefs/debug.c
index bc049ff599b3b9d1d7126d77b389d8a3e2492e27..c0b4d9057f29eacea1bd6574929f8d4ae4427e41 100644 (file)
--- a/libbcachefs/debug.c
+++ b/libbcachefs/debug.c
@@ -366,36 +366,23 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf,
                               size_t size, loff_t *ppos)
 {
        struct dump_iter *i = file->private_data;
-       struct btree_trans *trans;
-       struct btree_iter iter;
-       struct bkey_s_c k;
-       ssize_t ret;
 
        i->ubuf = buf;
        i->size = size;
        i->ret  = 0;
 
-       ret = flush_buf(i);
-       if (ret)
-               return ret;
-
-       trans = bch2_trans_get(i->c);
-       ret = for_each_btree_key(trans, iter, i->id, i->from,
-                                BTREE_ITER_PREFETCH|
-                                BTREE_ITER_ALL_SNAPSHOTS, k, ({
-               bch2_bkey_val_to_text(&i->buf, i->c, k);
-               prt_newline(&i->buf);
-               bch2_trans_unlock(trans);
-               flush_buf(i);
-       }));
-       i->from = iter.pos;
-
-       bch2_trans_put(trans);
-
-       if (!ret)
-               ret = flush_buf(i);
-
-       return ret ?: i->ret;
+       return flush_buf(i) ?:
+               bch2_trans_run(i->c,
+                       for_each_btree_key(trans, iter, i->id, i->from,
+                                          BTREE_ITER_PREFETCH|
+                                          BTREE_ITER_ALL_SNAPSHOTS, k, ({
+                               bch2_bkey_val_to_text(&i->buf, i->c, k);
+                               prt_newline(&i->buf);
+                               bch2_trans_unlock(trans);
+                               i->from = bpos_successor(iter.pos);
+                               flush_buf(i);
+                       }))) ?:
+               i->ret;
 }
 
 static const struct file_operations btree_debug_ops = {
@@ -463,46 +450,32 @@ static ssize_t bch2_read_bfloat_failed(struct file *file, char __user *buf,
                                       size_t size, loff_t *ppos)
 {
        struct dump_iter *i = file->private_data;
-       struct btree_trans *trans;
-       struct btree_iter iter;
-       struct bkey_s_c k;
-       ssize_t ret;
 
        i->ubuf = buf;
        i->size = size;
        i->ret  = 0;
 
-       ret = flush_buf(i);
-       if (ret)
-               return ret;
-
-       trans = bch2_trans_get(i->c);
-
-       ret = for_each_btree_key(trans, iter, i->id, i->from,
-                                BTREE_ITER_PREFETCH|
-                                BTREE_ITER_ALL_SNAPSHOTS, k, ({
-               struct btree_path_level *l =
-                       &btree_iter_path(trans, &iter)->l[0];
-               struct bkey_packed *_k =
-                       bch2_btree_node_iter_peek(&l->iter, l->b);
-
-               if (bpos_gt(l->b->key.k.p, i->prev_node)) {
-                       bch2_btree_node_to_text(&i->buf, i->c, l->b);
-                       i->prev_node = l->b->key.k.p;
-               }
-
-               bch2_bfloat_to_text(&i->buf, l->b, _k);
-               bch2_trans_unlock(trans);
-               flush_buf(i);
-       }));
-       i->from = iter.pos;
-
-       bch2_trans_put(trans);
-
-       if (!ret)
-               ret = flush_buf(i);
-
-       return ret ?: i->ret;
+       return flush_buf(i) ?:
+               bch2_trans_run(i->c,
+                       for_each_btree_key(trans, iter, i->id, i->from,
+                                          BTREE_ITER_PREFETCH|
+                                          BTREE_ITER_ALL_SNAPSHOTS, k, ({
+                               struct btree_path_level *l =
+                                       &btree_iter_path(trans, &iter)->l[0];
+                               struct bkey_packed *_k =
+                                       bch2_btree_node_iter_peek(&l->iter, l->b);
+
+                               if (bpos_gt(l->b->key.k.p, i->prev_node)) {
+                                       bch2_btree_node_to_text(&i->buf, i->c, l->b);
+                                       i->prev_node = l->b->key.k.p;
+                               }
+
+                               bch2_bfloat_to_text(&i->buf, l->b, _k);
+                               bch2_trans_unlock(trans);
+                               i->from = bpos_successor(iter.pos);
+                               flush_buf(i);
+                       }))) ?:
+               i->ret;
 }
 
 static const struct file_operations bfloat_failed_debug_ops = {