Commit 36df53f4 authored by Chris Snook's avatar Chris Snook Committed by Theodore Ts'o

jbd2: Remove printk from J_ASSERT to preserve registers during BUG

Signed-off-by: default avatarChris Snook <csnook@redhat.com>
Cc: "Stephen C. Tweedie" <sct@redhat.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent abcb2947
...@@ -256,17 +256,7 @@ typedef struct journal_superblock_s ...@@ -256,17 +256,7 @@ typedef struct journal_superblock_s
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/sched.h> #include <linux/sched.h>
#define JBD2_ASSERTIONS #define J_ASSERT(assert) BUG_ON(!(assert))
#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)
#if defined(CONFIG_BUFFER_DEBUG) #if defined(CONFIG_BUFFER_DEBUG)
void buffer_assertion_failure(struct buffer_head *bh); void buffer_assertion_failure(struct buffer_head *bh);
...@@ -282,10 +272,6 @@ 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) #define J_ASSERT_JH(jh, expr) J_ASSERT(expr)
#endif #endif
#else
#define J_ASSERT(assert) do { } while (0)
#endif /* JBD2_ASSERTIONS */
#if defined(JBD2_PARANOID_IOFAIL) #if defined(JBD2_PARANOID_IOFAIL)
#define J_EXPECT(expr, why...) J_ASSERT(expr) #define J_EXPECT(expr, why...) J_ASSERT(expr)
#define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment