Update bcachefs sources to 0d63ed13ea3d closures: Fix race in closure_sync()

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

diff --git a/libbcachefs/backpointers.c b/libbcachefs/backpointers.c
index d412bae553a020b2fa994f40716cecbb63ac02ee..e74295c21a03e3d315e85b997844052200a25510 100644 (file)
--- a/libbcachefs/backpointers.c
+++ b/libbcachefs/backpointers.c
@@ -55,7 +55,7 @@ int bch2_backpointer_invalid(const struct bch_fs *c, struct bkey_s_c k,
 void bch2_backpointer_to_text(struct printbuf *out, const struct bch_backpointer *bp)
 {
        prt_printf(out, "btree=%s l=%u offset=%llu:%u len=%u pos=",
-              bch2_btree_ids[bp->btree_id],
+              bch2_btree_id_str(bp->btree_id),
               bp->level,
               (u64) (bp->bucket_offset >> MAX_EXTENT_COMPRESS_RATIO_SHIFT),
               (u32) bp->bucket_offset & ~(~0U << MAX_EXTENT_COMPRESS_RATIO_SHIFT),
@@ -134,31 +134,15 @@ static noinline int backpointer_mod_err(struct btree_trans *trans,
 }
 
 int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *trans,
-                               struct bpos bucket,
+                               struct bkey_i_backpointer *bp_k,
                                struct bch_backpointer bp,
                                struct bkey_s_c orig_k,
                                bool insert)
 {
-       struct bch_fs *c = trans->c;
-       struct bkey_i_backpointer *bp_k;
        struct btree_iter bp_iter;
        struct bkey_s_c k;
        int ret;
 
-       bp_k = bch2_trans_kmalloc_nomemzero(trans, sizeof(struct bkey_i_backpointer));
-       ret = PTR_ERR_OR_ZERO(bp_k);
-       if (ret)
-               return ret;
-
-       bkey_backpointer_init(&bp_k->k_i);
-       bp_k->k.p = bucket_pos_to_bp(c, bucket, bp.bucket_offset);
-       bp_k->v = bp;
-
-       if (!insert) {
-               bp_k->k.type = KEY_TYPE_deleted;
-               set_bkey_val_u64s(&bp_k->k, 0);
-       }
-
        k = bch2_bkey_get_iter(trans, &bp_iter, BTREE_ID_backpointers,
                               bp_k->k.p,
                               BTREE_ITER_INTENT|
@@ -367,20 +351,17 @@ static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_
 {
        struct bch_fs *c = trans->c;
        struct btree_iter alloc_iter = { NULL };
-       struct bch_dev *ca;
        struct bkey_s_c alloc_k;
        struct printbuf buf = PRINTBUF;
        int ret = 0;
 
        if (fsck_err_on(!bch2_dev_exists2(c, k.k->p.inode), c,
-                       "backpointer for mising device:\n%s",
+                       "backpointer for missing device:\n%s",
                        (bch2_bkey_val_to_text(&buf, c, k), buf.buf))) {
                ret = bch2_btree_delete_at(trans, bp_iter, 0);
                goto out;
        }
 
-       ca = bch_dev_bkey_exists(c, k.k->p.inode);
-
        alloc_k = bch2_bkey_get_iter(trans, &alloc_iter, BTREE_ID_alloc,
                                     bp_pos_to_bucket(c, k.k->p), 0);
        ret = bkey_err(alloc_k);
@@ -409,10 +390,10 @@ int bch2_check_btree_backpointers(struct bch_fs *c)
        int ret;
 
        ret = bch2_trans_run(c,
-               for_each_btree_key_commit(&trans, iter,
+               for_each_btree_key_commit(trans, iter,
                        BTREE_ID_backpointers, POS_MIN, 0, k,
                        NULL, NULL, BTREE_INSERT_LAZY_RW|BTREE_INSERT_NOFAIL,
-                 bch2_check_btree_backpointer(&trans, &iter, k)));
+                 bch2_check_btree_backpointer(trans, &iter, k)));
        if (ret)
                bch_err_fn(c, ret);
        return ret;
@@ -472,12 +453,12 @@ fsck_err:
        return ret;
 missing:
        prt_printf(&buf, "missing backpointer for btree=%s l=%u ",
-              bch2_btree_ids[bp.btree_id], bp.level);
+              bch2_btree_id_str(bp.btree_id), bp.level);
        bch2_bkey_val_to_text(&buf, c, orig_k);
        prt_printf(&buf, "\nbp pos ");
        bch2_bpos_to_text(&buf, bp_iter.pos);
 
-       if (c->sb.version < bcachefs_metadata_version_backpointers ||
+       if (c->sb.version_upgrade_complete < bcachefs_metadata_version_backpointers ||
            c->opts.reconstruct_alloc ||
            fsck_err(c, "%s", buf.buf))
                ret = bch2_bucket_backpointer_mod(trans, bucket, bp, orig_k, true);
@@ -645,7 +626,7 @@ static int bch2_check_extents_to_backpointers_pass(struct btree_trans *trans,
        struct bch_fs *c = trans->c;
        struct btree_iter iter;
        enum btree_id btree_id;
-       struct bpos_level last_flushed = { UINT_MAX };
+       struct bpos_level last_flushed = { UINT_MAX, POS_MIN };
        int ret = 0;
 
        for (btree_id = 0; btree_id < btree_id_nr_alive(c); btree_id++) {
@@ -722,7 +703,7 @@ static int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,
 
                --btree_nodes;
                if (!btree_nodes) {
-                       *end = alloc_k.k->p;
+                       *end = alloc_k.k ? alloc_k.k->p : SPOS_MAX;
                        break;
                }
 
@@ -742,13 +723,12 @@ static int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,
 
 int bch2_check_extents_to_backpointers(struct bch_fs *c)
 {
-       struct btree_trans trans;
+       struct btree_trans *trans = bch2_trans_get(c);
        struct bpos start = POS_MIN, end;
        int ret;
 
-       bch2_trans_init(&trans, c, 0, 0);
        while (1) {
-               ret = bch2_get_alloc_in_memory_pos(&trans, start, &end);
+               ret = bch2_get_alloc_in_memory_pos(trans, start, &end);
                if (ret)
                        break;
 
@@ -768,13 +748,13 @@ int bch2_check_extents_to_backpointers(struct bch_fs *c)
                        printbuf_exit(&buf);
                }
 
-               ret = bch2_check_extents_to_backpointers_pass(&trans, start, end);
+               ret = bch2_check_extents_to_backpointers_pass(trans, start, end);
                if (ret || bpos_eq(end, SPOS_MAX))
                        break;
 
                start = bpos_successor(end);
        }
-       bch2_trans_exit(&trans);
+       bch2_trans_put(trans);
 
        if (ret)
                bch_err_fn(c, ret);
@@ -843,13 +823,12 @@ static int bch2_check_backpointers_to_extents_pass(struct btree_trans *trans,
 
 int bch2_check_backpointers_to_extents(struct bch_fs *c)
 {
-       struct btree_trans trans;
+       struct btree_trans *trans = bch2_trans_get(c);
        struct bbpos start = (struct bbpos) { .btree = 0, .pos = POS_MIN, }, end;
        int ret;
 
-       bch2_trans_init(&trans, c, 0, 0);
        while (1) {
-               ret = bch2_get_btree_in_memory_pos(&trans,
+               ret = bch2_get_btree_in_memory_pos(trans,
                                                   (1U << BTREE_ID_extents)|
                                                   (1U << BTREE_ID_reflink),
                                                   ~0,
@@ -875,13 +854,13 @@ int bch2_check_backpointers_to_extents(struct bch_fs *c)
                        printbuf_exit(&buf);
                }
 
-               ret = bch2_check_backpointers_to_extents_pass(&trans, start, end);
+               ret = bch2_check_backpointers_to_extents_pass(trans, start, end);
                if (ret || !bbpos_cmp(end, BBPOS_MAX))
                        break;
 
                start = bbpos_successor(end);
        }
-       bch2_trans_exit(&trans);
+       bch2_trans_put(trans);
 
        if (ret)
                bch_err_fn(c, ret);