Update bcachefs sources to 9e7ae5219c bcachefs: Make write points more dynamic

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

diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c
index c6659259b14dd89969aa0432c80ed8379a9ed370..d7f27a3de27da3c0db08b46b41f0f440ed178f7b 100644 (file)
--- a/libbcachefs/migrate.c
+++ b/libbcachefs/migrate.c
@@ -15,6 +15,7 @@
 
 static int issue_migration_move(struct bch_dev *ca,
                                struct moving_context *ctxt,
+                               struct bch_devs_mask *devs,
                                struct bkey_s_c k)
 {
        struct bch_fs *c = ca->fs;
@@ -33,7 +34,7 @@ static int issue_migration_move(struct bch_dev *ca,
 found:
        /* XXX: we need to be doing something with the disk reservation */
 
-       ret = bch2_data_move(c, ctxt, &c->migration_write_point, k, ptr);
+       ret = bch2_data_move(c, ctxt, devs, k, ptr);
        if (ret)
                bch2_disk_reservation_put(c, &res);
        return ret;
@@ -110,7 +111,7 @@ int bch2_move_data_off_device(struct bch_dev *ca)
                                                   ca->dev_idx))
                                goto next;
 
-                       ret = issue_migration_move(ca, &ctxt, k);
+                       ret = issue_migration_move(ca, &ctxt, NULL, k);
                        if (ret == -ENOMEM) {
                                bch2_btree_iter_unlock(&iter);