From 21a9f5a79d005a387428238ce662226c6bb1f510 Mon Sep 17 00:00:00 2001
From: Chris Snook <csnook@redhat.com>
Date: Thu, 18 Oct 2007 23:39:21 -0700
Subject: [PATCH] --- yaml --- r: 71397 b: refs/heads/master c:
 1c099244485ff8bb93c2cd41304a445adc7f54e6 h: refs/heads/master i:   71395:
 84b6c7793297be3989562107dc8c69095a66b3d0 v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/jbd.h | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 92b01f3f2a1f..025e96cc5f25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c3478a523a48470eb11a23f01249250684677d9
+refs/heads/master: 1c099244485ff8bb93c2cd41304a445adc7f54e6
diff --git a/trunk/include/linux/jbd.h b/trunk/include/linux/jbd.h
index a3abf51e488f..d77f67d954f8 100644
--- a/trunk/include/linux/jbd.h
+++ b/trunk/include/linux/jbd.h
@@ -248,17 +248,7 @@ typedef struct journal_superblock_s
 #include <linux/fs.h>
 #include <linux/sched.h>
 
-#define JBD_ASSERTIONS
-#ifdef JBD_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);
@@ -274,10 +264,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		/* JBD_ASSERTIONS */
-
 #if defined(JBD_PARANOID_IOFAIL)
 #define J_EXPECT(expr, why...)		J_ASSERT(expr)
 #define J_EXPECT_BH(bh, expr, why...)	J_ASSERT_BH(bh, expr)