Update bcachefs sources to 717b356d1d bcachefs: Convert journal validation to bkey_in...

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

diff --git a/libbcachefs/move.c b/libbcachefs/move.c
index fd629136824b7414e1eca56238bd8812e08d0147..05272673901d2ba93cccd69c0b1e9febf4042803 100644 (file)
--- a/libbcachefs/move.c
+++ b/libbcachefs/move.c
@@ -632,7 +632,7 @@ int bch2_move_data(struct bch_fs *c,
        bch2_moving_ctxt_init(&ctxt, c, rate, stats, wp, wait_on_copygc);
 
        for (id = start_btree_id;
-            id <= min_t(unsigned, end_btree_id, BTREE_ID_NR - 1);
+            id <= min_t(unsigned, end_btree_id, btree_id_nr_alive(c) - 1);
             id++) {
                stats->btree_id = id;
 
@@ -640,6 +640,9 @@ int bch2_move_data(struct bch_fs *c,
                    id != BTREE_ID_reflink)
                        continue;
 
+               if (!bch2_btree_id_root(c, id)->b)
+                       continue;
+
                ret = __bch2_move_data(&ctxt,
                                       id == start_btree_id ? start_pos : POS_MIN,
                                       id == end_btree_id   ? end_pos   : POS_MAX,
@@ -690,7 +693,7 @@ int __bch2_evacuate_bucket(struct btree_trans *trans,
        bch2_trans_iter_exit(trans, &iter);
 
        if (ret) {
-               bch_err(c, "%s: error looking up alloc key: %s", __func__, bch2_err_str(ret));
+               bch_err_msg(c, ret, "looking up alloc key");
                goto err;
        }
 
@@ -701,7 +704,7 @@ int __bch2_evacuate_bucket(struct btree_trans *trans,
 
        ret = bch2_btree_write_buffer_flush(trans);
        if (ret) {
-               bch_err(c, "%s: error flushing btree write buffer: %s", __func__, bch2_err_str(ret));
+               bch_err_msg(c, ret, "flushing btree write buffer");
                goto err;
        }
 
@@ -861,10 +864,13 @@ static int bch2_move_btree(struct bch_fs *c,
        stats->data_type = BCH_DATA_btree;
 
        for (id = start_btree_id;
-            id <= min_t(unsigned, end_btree_id, BTREE_ID_NR - 1);
+            id <= min_t(unsigned, end_btree_id, btree_id_nr_alive(c) - 1);
             id++) {
                stats->btree_id = id;
 
+               if (!bch2_btree_id_root(c, id)->b)
+                       continue;
+
                bch2_trans_node_iter_init(&trans, &iter, id, POS_MIN, 0, 0,
                                          BTREE_ITER_PREFETCH);
 retry:
@@ -904,7 +910,7 @@ next:
        bch2_trans_exit(&trans);
 
        if (ret)
-               bch_err(c, "error in %s(): %s", __func__, bch2_err_str(ret));
+               bch_err_fn(c, ret);
 
        bch2_btree_interior_updates_flush(c);
 
@@ -1029,6 +1035,8 @@ int bch2_scan_old_btree_nodes(struct bch_fs *c, struct bch_move_stats *stats)
                mutex_unlock(&c->sb_lock);
        }
 
+       if (ret)
+               bch_err_fn(c, ret);
        return ret;
 }