Move c_src dirs back to toplevel

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

diff --git a/libbcachefs/migrate.c b/libbcachefs/migrate.c
index e3a51f6d6c9b25dcae89934eace9e68b038531de..5623cee3ef8693413ee51d7dd521c496e90f206c 100644 (file)
--- a/libbcachefs/migrate.c
+++ b/libbcachefs/migrate.c
@@ -79,8 +79,6 @@ static int bch2_dev_usrdata_drop_key(struct btree_trans *trans,
 static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags)
 {
        struct btree_trans *trans = bch2_trans_get(c);
-       struct btree_iter iter;
-       struct bkey_s_c k;
        enum btree_id id;
        int ret = 0;
 
@@ -90,7 +88,7 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, unsigned dev_idx, int flags)
 
                ret = for_each_btree_key_commit(trans, iter, id, POS_MIN,
                                BTREE_ITER_PREFETCH|BTREE_ITER_ALL_SNAPSHOTS, k,
-                               NULL, NULL, BTREE_INSERT_NOFAIL,
+                               NULL, NULL, BCH_TRANS_COMMIT_no_enospc,
                        bch2_dev_usrdata_drop_key(trans, &iter, k, dev_idx, flags));
                if (ret)
                        break;
@@ -145,10 +143,9 @@ retry:
                                continue;
                        }
 
-                       if (ret) {
-                               bch_err_msg(c, ret, "updating btree node key");
+                       bch_err_msg(c, ret, "updating btree node key");
+                       if (ret)
                                break;
-                       }
 next:
                        bch2_btree_iter_next_node(&iter);
                }