From: Kent Overstreet Date: Tue, 6 Jul 2021 02:08:28 +0000 (-0400) Subject: bcachefs: Fix bch2_btree_iter_peek_slot() assertion X-Git-Tag: v6.7-rc1~201^2~1486 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c21affdd06661c8eb73c71fc54cdb8ec921b968f;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Fix bch2_btree_iter_peek_slot() assertion This assertion is checking that what the iterator points to is consistent with iter->real_pos, and since it's an internal btree ordering property it should be using bpos_cmp. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 8d42feae070af..1592929178bfa 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1859,7 +1859,7 @@ struct bkey_s_c bch2_btree_iter_peek_slot(struct btree_iter *iter) switch (btree_iter_type(iter)) { case BTREE_ITER_KEYS: k = btree_iter_level_peek_all(iter, &iter->l[0]); - EBUG_ON(k.k && bkey_deleted(k.k) && bkey_cmp(k.k->p, iter->pos) == 0); + EBUG_ON(k.k && bkey_deleted(k.k) && bpos_cmp(k.k->p, iter->pos) == 0); break; case BTREE_ITER_CACHED: ck = (void *) iter->l[0].b;