Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c099244 authored by Chris Snook's avatar Chris Snook Committed by Linus Torvalds
Browse files

jbd: remove printk() from J_ASSERT macros 



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 avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8c3478a5

include/linux/jbd.h

+1 −15
Original line number Diff line number Diff line
@@ -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)