jbd2: Remove printk from J_ASSERT to preserve registers during BUG

Signed-off-by: Chris Snook <csnook@redhat.com>
Cc: "Stephen C. Tweedie" <sct@redhat.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

1 files changed, 1 insertions, 15 deletions

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 06ef11457051..d5f7cff4cb28 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -256,17 +256,7 @@ typedef struct journal_superblock_s
 #include <linux/fs.h>
 #include <linux/sched.h>
 
-#define JBD2_ASSERTIONS
-#ifdef JBD2_ASSERTIONS
-#define J_ASSERT(assert)                                                \
-do {                                                                    \
-        if (!(assert)) {                                                \
-                printk (KERN_EMERG                                      \
-                        "Assertion failure in %s() at %s:%d: \"%s\"\n", \
-                        __FUNCTION__, __FILE__, __LINE__, # assert);    \
-                BUG();                                                  \
-        }                                                               \
-} while (0)
+#define J_ASSERT(assert)        BUG_ON(!(assert))
 
 #if defined(CONFIG_BUFFER_DEBUG)
 void buffer_assertion_failure(struct buffer_head *bh);
@@ -282,10 +272,6 @@ void buffer_assertion_failure(struct buffer_head *bh);
 #define J_ASSERT_JH(jh, expr)   J_ASSERT(expr)
 #endif
 
-#else
-#define J_ASSERT(assert)        do { } while (0)
-#endif          /* JBD2_ASSERTIONS */
-
 #if defined(JBD2_PARANOID_IOFAIL)
 #define J_EXPECT(expr, why...)          J_ASSERT(expr)
 #define J_EXPECT_BH(bh, expr, why...)   J_ASSERT_BH(bh, expr)