Skip to content

Commit

Permalink
jbd2: Remove printk from J_ASSERT to preserve registers during BUG
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chris Snook authored and Theodore Ts'o committed Jan 29, 2008
1 parent abcb294 commit 36df53f
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions include/linux/jbd2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit 36df53f

Please sign in to comment.