bcachefs: Fix a debug assertion
authorKent Overstreet <kent.overstreet@gmail.com>
Sat, 12 Oct 2019 18:13:45 +0000 (14:13 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:08:29 +0000 (17:08 -0400)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_iter.c

index a91cee79770304e0cc177d90a8330a200c1e04a8..8aaaa6615efffa6a8b5935893d48bd5b55ff96fd 100644 (file)
@@ -1359,6 +1359,13 @@ static inline struct bkey_s_c btree_iter_peek_uptodate(struct btree_iter *iter)
 
                if (debug_check_iterators(iter->trans->c)) {
                        struct bkey k = bkey_unpack_key(l->b, _k);
+
+                       /*
+                        * this flag is internal to the btree code,
+                        * we don't care if it doesn't match - if it's now set
+                        * it just means the key has been written out to disk:
+                        */
+                       k.needs_whiteout = iter->k.needs_whiteout;
                        BUG_ON(memcmp(&k, &iter->k, sizeof(k)));
                }