From 538abcb8a1dfcd8473a90d931b8603e4a03812ca Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 12 Oct 2019 14:13:45 -0400 Subject: [PATCH] bcachefs: Fix a debug assertion Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_iter.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index a91cee7977030..8aaaa6615efff 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -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))); } -- 2.30.2