From b08fb3587c2d14313a8cf6df4e801d16af1117a5 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 3 Aug 2016 22:22:03 -0800 Subject: bcache: fix a debug check --- drivers/md/bcache/bset.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index c301d65c8a09..2c8236b3f1a0 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c @@ -1205,11 +1205,12 @@ static struct bkey_packed *bch_bset_search(struct btree_keys *b, !btree_iter_pos_cmp_packed(f, search, m, strictly_greater)) m = bkey_next(m); - if (btree_keys_expensive_checks(b)) { - struct bkey_packed *p = bkey_prev(t, m); + if (IS_ENABLED(CONFIG_BCACHE_DEBUG)) { + struct bkey_packed *prev = bkey_prev(t, m); - BUG_ON(p && - bkey_cmp_p_or_unp(f, p, packed_search, search) >= 0); + BUG_ON(prev && + btree_iter_pos_cmp_p_or_unp(f, search, packed_search, + prev, strictly_greater)); } return m; -- cgit v1.2.3