Move c_src dirs back to toplevel

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

diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c
index 8b258d966d042f73e9448a3086373d8d8a1d6b5f..5623cee3ef8693413ee51d7dd521c496e90f206c 100644 (file)
--- a/libbcachefs/migrate.c
+++ b/libbcachefs/migrate.c
@@ -10,7 +10,7 @@
 #include "buckets.h"
 #include "errcode.h"
 #include "extents.h"
-#include "io.h"
+#include "io_write.h"
 #include "journal.h"
 #include "keylist.h"
 #include "migrate.h"
@@ -46,16 +46,14 @@ static int bch2_dev_usrdata_drop_key(struct btree_trans *trans,
        struct bkey_i *n;
        int ret;
 
-       if (!bch2_bkey_has_device(k, dev_idx))
+       if (!bch2_bkey_has_device_c(k, dev_idx))
                return 0;
 
-       n = bch2_trans_kmalloc(trans, bkey_bytes(k.k));
+       n = bch2_bkey_make_mut(trans, iter, &k, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);
        ret = PTR_ERR_OR_ZERO(n);
        if (ret)
                return ret;
 
-       bkey_reassemble(n, k);
-
        ret = drop_dev_ptrs(c, bkey_i_to_s(n), dev_idx, flags, false);
        if (ret)
                return ret;
@@ -75,40 +73,35 @@ static int bch2_dev_usrdata_drop_key(struct btree_trans *trans,
         */
        if (bkey_deleted(&n->k))
                n->k.size = 0;
-
-       return bch2_trans_update(trans, iter, n, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE);
+       return 0;
 }
 
 static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags)
 {
-       struct btree_trans trans;
-       struct btree_iter iter;
-       struct bkey_s_c k;
+       struct btree_trans *trans = bch2_trans_get(c);
        enum btree_id id;
        int ret = 0;
 
-       bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0);
-
        for (id = 0; id < BTREE_ID_NR; id++) {
                if (!btree_type_has_ptrs(id))
                        continue;
 
-               ret = for_each_btree_key_commit(&trans, iter, id, POS_MIN,
+               ret = for_each_btree_key_commit(trans, iter, id, POS_MIN,
                                BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,
-                               NULL, NULL, BTREE_INSERT_NOFAIL,
-                       bch2_dev_usrdata_drop_key(&trans, &iter, k, dev_idx, flags));
+                               NULL, NULL, BCH_TRANS_COMMIT_no_enospc,
+                       bch2_dev_usrdata_drop_key(trans, &iter, k, dev_idx, flags));
                if (ret)
                        break;
        }
 
-       bch2_trans_exit(&trans);
+       bch2_trans_put(trans);
 
        return ret;
 }
 
 static int bch2_dev_metadata_drop(struct bch_fs *c, unsigned dev_idx, int flags)
 {
-       struct btree_trans trans;
+       struct btree_trans *trans;
        struct btree_iter iter;
        struct closure cl;
        struct btree *b;
@@ -120,20 +113,19 @@ static int bch2_dev_metadata_drop(struct bch_fs *c, unsigned dev_idx, int flags)
        if (flags & BCH_FORCE_IF_METADATA_LOST)
                return -EINVAL;
 
+       trans = bch2_trans_get(c);
        bch2_bkey_buf_init(&k);
-       bch2_trans_init(&trans, c, 0, 0);
        closure_init_stack(&cl);
 
        for (id = 0; id < BTREE_ID_NR; id++) {
-               bch2_trans_node_iter_init(&trans, &iter, id, POS_MIN, 0, 0,
+               bch2_trans_node_iter_init(trans, &iter, id, POS_MIN, 0, 0,
                                          BTREE_ITER_PREFETCH);
 retry:
                ret = 0;
-               while (bch2_trans_begin(&trans),
+               while (bch2_trans_begin(trans),
                       (b = bch2_btree_iter_peek_node(&iter)) &&
                       !(ret = PTR_ERR_OR_ZERO(b))) {
-                       if (!bch2_bkey_has_device(bkey_i_to_s_c(&b->key),
-                                                 dev_idx))
+                       if (!bch2_bkey_has_device_c(bkey_i_to_s_c(&b->key), dev_idx))
                                goto next;
 
                        bch2_bkey_buf_copy(&k, c, &b->key);
@@ -145,24 +137,22 @@ retry:
                                break;
                        }
 
-                       ret = bch2_btree_node_update_key(&trans, &iter, b, k.k, false);
+                       ret = bch2_btree_node_update_key(trans, &iter, b, k.k, 0, false);
                        if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) {
                                ret = 0;
                                continue;
                        }
 
-                       if (ret) {
-                               bch_err(c, "Error updating btree node key: %s",
-                                       bch2_err_str(ret));
+                       bch_err_msg(c, ret, "updating btree node key");
+                       if (ret)
                                break;
-                       }
 next:
                        bch2_btree_iter_next_node(&iter);
                }
                if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
                        goto retry;
 
-               bch2_trans_iter_exit(&trans, &iter);
+               bch2_trans_iter_exit(trans, &iter);
 
                if (ret)
                        goto err;
@@ -171,8 +161,8 @@ next:
        bch2_btree_interior_updates_flush(c);
        ret = 0;
 err:
-       bch2_trans_exit(&trans);
        bch2_bkey_buf_exit(&k, c);
+       bch2_trans_put(trans);
 
        BUG_ON(bch2_err_matches(ret, BCH_ERR_transaction_restart));