diff options
author | Chris Snook <csnook@redhat.com> | 2007-10-19 02:39:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:34 -0400 |
commit | 1c099244485ff8bb93c2cd41304a445adc7f54e6 (patch) | |
tree | f507d266b76162bdee29ce1f0d32296fb0ca46ab /include/linux | |
parent | 8c3478a523a48470eb11a23f01249250684677d9 (diff) |
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>
Diffstat (limited to 'include/linux')
-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 | |||
248 | #include <linux/fs.h> | 248 | #include <linux/fs.h> |
249 | #include <linux/sched.h> | 249 | #include <linux/sched.h> |
250 | 250 | ||
251 | #define JBD_ASSERTIONS | 251 | #define J_ASSERT(assert) BUG_ON(!(assert)) |
252 | #ifdef JBD_ASSERTIONS | ||
253 | #define J_ASSERT(assert) \ | ||
254 | do { \ | ||
255 | if (!(assert)) { \ | ||
256 | printk (KERN_EMERG \ | ||
257 | "Assertion failure in %s() at %s:%d: \"%s\"\n", \ | ||
258 | __FUNCTION__, __FILE__, __LINE__, # assert); \ | ||
259 | BUG(); \ | ||
260 | } \ | ||
261 | } while (0) | ||
262 | 252 | ||
263 | #if defined(CONFIG_BUFFER_DEBUG) | 253 | #if defined(CONFIG_BUFFER_DEBUG) |
264 | void buffer_assertion_failure(struct buffer_head *bh); | 254 | void buffer_assertion_failure(struct buffer_head *bh); |
@@ -274,10 +264,6 @@ void buffer_assertion_failure(struct buffer_head *bh); | |||
274 | #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) | 264 | #define J_ASSERT_JH(jh, expr) J_ASSERT(expr) |
275 | #endif | 265 | #endif |
276 | 266 | ||
277 | #else | ||
278 | #define J_ASSERT(assert) do { } while (0) | ||
279 | #endif /* JBD_ASSERTIONS */ | ||
280 | |||
281 | #if defined(JBD_PARANOID_IOFAIL) | 267 | #if defined(JBD_PARANOID_IOFAIL) |
282 | #define J_EXPECT(expr, why...) J_ASSERT(expr) | 268 | #define J_EXPECT(expr, why...) J_ASSERT(expr) |
283 | #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) | 269 | #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) |