summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-06-28 18:28:05 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2018-06-28 18:28:05 -0400
commit8f3cdbfdfad66ca6824e85458184ac0ab9349957 (patch)
tree5a0e9fae2c3f6c677a7a362ce7f038cb47b12fa4
parent9b233320cdbe4a89f93e926074381f5db3133dbc (diff)
fixup! bcachefs: fix an assertion
-rw-r--r--fs/bcachefs/btree_iter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 62c878fd6b3f..5e4ddbec878d 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1359,7 +1359,6 @@ recheck:
n.p.offset));
EBUG_ON(!n.size);
- n.type = KEY_TYPE_DISCARD;
}
iter->k = n;
@@ -1380,11 +1379,12 @@ struct bkey_s_c bch2_btree_iter_peek_slot(struct btree_iter *iter)
if (iter->uptodate == BTREE_ITER_UPTODATE) {
struct bkey_s_c ret = { .k = &iter->k };
- if (!bkey_whiteout(&iter->k))
+ if (!bkey_deleted(&iter->k))
ret.v = bkeyp_val(&l->b->format,
__bch2_btree_node_iter_peek_all(&l->iter, l->b));
- if (debug_check_bkeys(iter->c))
+ if (debug_check_bkeys(iter->c) &&
+ !bkey_deleted(ret.k))
bch2_bkey_debugcheck(iter->c, l->b, ret);
return ret;
}