diff options
| author | Chris Snook <csnook@redhat.com> | 2007-10-18 23:39:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:53:34 -0700 |
| commit | 1c099244485ff8bb93c2cd41304a445adc7f54e6 (patch) | |
| tree | f507d266b76162bdee29ce1f0d32296fb0ca46ab | |
| parent | 8c3478a523a48470eb11a23f01249250684677d9 (diff) | |
| download | linux-1c099244485ff8bb93c2cd41304a445adc7f54e6.tar.gz linux-1c099244485ff8bb93c2cd41304a445adc7f54e6.tar.bz2 linux-1c099244485ff8bb93c2cd41304a445adc7f54e6.zip | |
jbd: remove printk() from J_ASSERT macros
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: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/jbd.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index a3abf51e488f..d77f67d954f8 100644 --- a/include/linux/jbd.h +++ b/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) |