]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: Tighten up btree_path assertions
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 21 Jul 2022 13:53:28 +0000 (09:53 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:37 +0000 (17:09 -0400)
Currently seeing a very rare and difficult to explain btree_path
inconsistency - this patch adds assertions to the only place that seems
to be missing them.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
fs/bcachefs/btree_iter.c

index 777e41a1224629fd39b5984cf5a9e418d5a30aee..01ca27ee6314d588fc1449acf142ec2da2f496bd 100644 (file)
@@ -1020,6 +1020,7 @@ static inline struct bkey_s_c btree_path_level_peek(struct btree_trans *trans,
 
        path->pos = k.k ? k.k->p : l->b->key.k.p;
        trans->paths_sorted = false;
+       bch2_btree_path_verify_level(trans, path, l - path->l);
        return k;
 }
 
@@ -1033,6 +1034,7 @@ static inline struct bkey_s_c btree_path_level_prev(struct btree_trans *trans,
 
        path->pos = k.k ? k.k->p : l->b->data->min_key;
        trans->paths_sorted = false;
+       bch2_btree_path_verify_level(trans, path, l - path->l);
        return k;
 }
 
@@ -1661,7 +1663,7 @@ out:
 int __must_check bch2_btree_path_traverse(struct btree_trans *trans,
                                          struct btree_path *path, unsigned flags)
 {
-       if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG)) {
+       if (0 && IS_ENABLED(CONFIG_BCACHEFS_DEBUG)) {
                unsigned restart_probability_bits = 4 << min(trans->restart_count, 32U);
                u64 max = ~(~0ULL << restart_probability_bits);