Update bcachefs sources to 1e3ca87f7b bcachefs: bcachefs_metadata_version_major_minor

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

diff --git a/libbcachefs/backpointers.c b/libbcachefs/backpointers.c
index 11201064d9a4522a373ad7b4e26e8fc0cd5a759a..d412bae553a020b2fa994f40716cecbb63ac02ee 100644 (file)
--- a/libbcachefs/backpointers.c
+++ b/libbcachefs/backpointers.c
@@ -38,7 +38,8 @@ static bool extent_matches_bp(struct bch_fs *c,
 }
 
 int bch2_backpointer_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                            unsigned flags, struct printbuf *err)
+                            enum bkey_invalid_flags flags,
+                            struct printbuf *err)
 {
        struct bkey_s_c_backpointer bp = bkey_s_c_to_backpointer(k);
        struct bpos bucket = bp_pos_to_bucket(c, bp.k->p);
@@ -103,7 +104,7 @@ static noinline int backpointer_mod_err(struct btree_trans *trans,
                bch2_bkey_val_to_text(&buf, c, orig_k);
 
                bch_err(c, "%s", buf.buf);
-       } else if (test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags)) {
+       } else if (c->curr_recovery_pass > BCH_RECOVERY_PASS_check_extents_to_backpointers) {
                prt_printf(&buf, "backpointer not found when deleting");
                prt_newline(&buf);
                printbuf_indent_add(&buf, 2);
@@ -124,7 +125,7 @@ static noinline int backpointer_mod_err(struct btree_trans *trans,
 
        printbuf_exit(&buf);
 
-       if (test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags)) {
+       if (c->curr_recovery_pass > BCH_RECOVERY_PASS_check_extents_to_backpointers) {
                bch2_inconsistent_error(c);
                return -EIO;
        } else {
@@ -257,7 +258,7 @@ static void backpointer_not_found(struct btree_trans *trans,
        bch2_backpointer_to_text(&buf, &bp);
        prt_printf(&buf, "\n  ");
        bch2_bkey_val_to_text(&buf, c, k);
-       if (!test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags))
+       if (c->curr_recovery_pass >= BCH_RECOVERY_PASS_check_extents_to_backpointers)
                bch_err_ratelimited(c, "%s", buf.buf);
        else
                bch2_trans_inconsistent(trans, "%s", buf.buf);
@@ -272,6 +273,7 @@ struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans,
                                         unsigned iter_flags)
 {
        struct bch_fs *c = trans->c;
+       struct btree_root *r = bch2_btree_id_root(c, bp.btree_id);
        struct bpos bucket = bp_pos_to_bucket(c, bp_pos);
        struct bkey_s_c k;
 
@@ -279,7 +281,7 @@ struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans,
                                  bp.btree_id,
                                  bp.pos,
                                  0,
-                                 min(bp.level, c->btree_roots[bp.btree_id].level),
+                                 min(bp.level, r->level),
                                  iter_flags);
        k = bch2_btree_iter_peek_slot(iter);
        if (bkey_err(k)) {
@@ -287,8 +289,8 @@ struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans,
                return k;
        }
 
-       if (bp.level == c->btree_roots[bp.btree_id].level + 1)
-               k = bkey_i_to_s_c(&c->btree_roots[bp.btree_id].key);
+       if (bp.level == r->level + 1)
+               k = bkey_i_to_s_c(&r->key);
 
        if (k.k && extent_matches_bp(c, bp.btree_id, bp.level, k, bucket, bp))
                return k;
@@ -404,12 +406,16 @@ int bch2_check_btree_backpointers(struct bch_fs *c)
 {
        struct btree_iter iter;
        struct bkey_s_c k;
+       int ret;
 
-       return bch2_trans_run(c,
+       ret = bch2_trans_run(c,
                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)));
+       if (ret)
+               bch_err_fn(c, ret);
+       return ret;
 }
 
 struct bpos_level {
@@ -527,6 +533,7 @@ static int check_btree_root_to_backpointers(struct btree_trans *trans,
                                            struct bpos_level *last_flushed)
 {
        struct bch_fs *c = trans->c;
+       struct btree_root *r = bch2_btree_id_root(c, btree_id);
        struct btree_iter iter;
        struct btree *b;
        struct bkey_s_c k;
@@ -535,8 +542,7 @@ static int check_btree_root_to_backpointers(struct btree_trans *trans,
        const union bch_extent_entry *entry;
        int ret;
 
-       bch2_trans_node_iter_init(trans, &iter, btree_id, POS_MIN, 0,
-                                 c->btree_roots[btree_id].level, 0);
+       bch2_trans_node_iter_init(trans, &iter, btree_id, POS_MIN, 0, r->level, 0);
        b = bch2_btree_iter_peek_node(&iter);
        ret = PTR_ERR_OR_ZERO(b);
        if (ret)
@@ -585,10 +591,10 @@ static size_t btree_nodes_fit_in_ram(struct bch_fs *c)
        return div_u64(mem_bytes >> 1, btree_bytes(c));
 }
 
-int bch2_get_btree_in_memory_pos(struct btree_trans *trans,
-                                unsigned btree_leaf_mask,
-                                unsigned btree_interior_mask,
-                                struct bbpos start, struct bbpos *end)
+static int bch2_get_btree_in_memory_pos(struct btree_trans *trans,
+                                       unsigned btree_leaf_mask,
+                                       unsigned btree_interior_mask,
+                                       struct bbpos start, struct bbpos *end)
 {
        struct btree_iter iter;
        struct bkey_s_c k;
@@ -636,12 +642,13 @@ static int bch2_check_extents_to_backpointers_pass(struct btree_trans *trans,
                                                   struct bpos bucket_start,
                                                   struct bpos bucket_end)
 {
+       struct bch_fs *c = trans->c;
        struct btree_iter iter;
        enum btree_id btree_id;
        struct bpos_level last_flushed = { UINT_MAX };
        int ret = 0;
 
-       for (btree_id = 0; btree_id < BTREE_ID_NR; btree_id++) {
+       for (btree_id = 0; btree_id < btree_id_nr_alive(c); btree_id++) {
                unsigned depth = btree_type_has_ptrs(btree_id) ? 0 : 1;
 
                bch2_trans_node_iter_init(trans, &iter, btree_id, POS_MIN, 0,
@@ -685,8 +692,8 @@ static struct bpos bucket_pos_to_bp_safe(const struct bch_fs *c,
                : bucket;
 }
 
-int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,
-                                struct bpos start, struct bpos *end)
+static int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,
+                                       struct bpos start, struct bpos *end)
 {
        struct btree_iter alloc_iter;
        struct btree_iter bp_iter;
@@ -769,6 +776,8 @@ int bch2_check_extents_to_backpointers(struct bch_fs *c)
        }
        bch2_trans_exit(&trans);
 
+       if (ret)
+               bch_err_fn(c, ret);
        return ret;
 }
 
@@ -805,8 +814,10 @@ static int check_one_backpointer(struct btree_trans *trans,
 
        if (fsck_err_on(!k.k, c,
                        "backpointer for missing extent\n  %s",
-                       (bch2_bkey_val_to_text(&buf, c, bp.s_c), buf.buf)))
-               return bch2_btree_delete_at_buffered(trans, BTREE_ID_backpointers, bp.k->p);
+                       (bch2_bkey_val_to_text(&buf, c, bp.s_c), buf.buf))) {
+               ret = bch2_btree_delete_at_buffered(trans, BTREE_ID_backpointers, bp.k->p);
+               goto out;
+       }
 out:
 fsck_err:
        bch2_trans_iter_exit(trans, &iter);
@@ -872,5 +883,7 @@ int bch2_check_backpointers_to_extents(struct bch_fs *c)
        }
        bch2_trans_exit(&trans);
 
+       if (ret)
+               bch_err_fn(c, ret);
        return ret;
 }