mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-07 04:09:21 +00:00
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>
This commit is contained in:
parent
8c3478a523
commit
1c09924448
1 changed files with 1 additions and 15 deletions
|
@ -248,17 +248,7 @@ typedef struct journal_superblock_s
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
|
|
||||||
#define JBD_ASSERTIONS
|
#define J_ASSERT(assert) BUG_ON(!(assert))
|
||||||
#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)
|
|
||||||
|
|
||||||
#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);
|
||||||
|
@ -274,10 +264,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 /* JBD_ASSERTIONS */
|
|
||||||
|
|
||||||
#if defined(JBD_PARANOID_IOFAIL)
|
#if defined(JBD_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)
|
||||||
|
|
Loading…
Reference in a new issue