diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-06 17:02:41 +0300 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:10:09 +0300 |
commit | 58705da67aedc3f68db322d2529ff52a5cdec0fa (patch) | |
tree | 6df3942024f4aad847da9afd52e020e4236f2de3 | |
parent | e691b391f02b2ddef1a784ea2d4cd3f46bb6a62a (diff) | |
download | linux-58705da67aedc3f68db322d2529ff52a5cdec0fa.tar.xz |
bcachefs: kill EBUG_ON() redefinition in bkey.c
our debug mode assertions in bkey.c haven't been getting run, whoops
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r-- | fs/bcachefs/bkey.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/fs/bcachefs/bkey.c b/fs/bcachefs/bkey.c index 34a8fe48581c..67f205992629 100644 --- a/fs/bcachefs/bkey.c +++ b/fs/bcachefs/bkey.c @@ -7,14 +7,6 @@ #include "bset.h" #include "util.h" -#undef EBUG_ON - -#ifdef DEBUG_BKEYS -#define EBUG_ON(cond) BUG_ON(cond) -#else -#define EBUG_ON(cond) -#endif - const struct bkey_format bch2_bkey_format_current = BKEY_FORMAT_CURRENT; void bch2_bkey_packed_to_binary_text(struct printbuf *out, @@ -601,7 +593,14 @@ struct bkey_format bch2_bkey_format_done(struct bkey_format_state *s) } } - EBUG_ON(bch2_bkey_format_validate(&ret)); +#ifdef CONFIG_BCACHEFS_DEBUG + { + struct printbuf buf = PRINTBUF; + + BUG_ON(bch2_bkey_format_validate(&ret, &buf)); + printbuf_exit(&buf); + } +#endif return ret; } |