From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 6 Aug 2023 14:02:41 +0000 (-0400)
Subject: bcachefs: kill EBUG_ON() redefinition in bkey.c
X-Git-Tag: io_uring-6.7-2023-11-10~119^2~142
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=58705da67aedc3f68db322d2529ff52a5cdec0fa;p=linux-block.git

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>
---

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;
 }