From 692d4031a458092bc602840739f97c4acf155dcb Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 2 Nov 2020 18:36:08 -0500 Subject: [PATCH] bcachefs: Split out debug_check_btree_accounting This check is very expensive Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/bcachefs.h | 2 ++ fs/bcachefs/bset.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h index 85b8b7c4c9e1..d56057f27e8f 100644 --- a/fs/bcachefs/bcachefs.h +++ b/fs/bcachefs/bcachefs.h @@ -265,6 +265,8 @@ do { \ BCH_DEBUG_PARAM(debug_check_bkeys, \ "Run bkey_debugcheck (primarily checking GC/allocation "\ "information) when iterating over keys") \ + BCH_DEBUG_PARAM(debug_check_btree_accounting, \ + "Verify btree accounting for keys within a node") \ BCH_DEBUG_PARAM(verify_btree_ondisk, \ "Reread btree nodes at various points to verify the " \ "mergesort in the read path against modifications " \ diff --git a/fs/bcachefs/bset.h b/fs/bcachefs/bset.h index c9fe83ded267..21e4ed4eacc3 100644 --- a/fs/bcachefs/bset.h +++ b/fs/bcachefs/bset.h @@ -658,7 +658,7 @@ static inline void bch2_verify_insert_pos(struct btree *b, static inline void bch2_verify_btree_nr_keys(struct btree *b) { - if (bch2_expensive_debug_checks) + if (bch2_debug_check_btree_accounting) __bch2_verify_btree_nr_keys(b); }