* [PATCH -next] jbd2: fix build when CONFIG_BUG is not enabled
[not found] <20111011201127.455df266dcbffb1d621f8576@canb.auug.org.au>
@ 2011-10-11 19:15 ` Randy Dunlap
2011-10-27 8:06 ` Ted Ts'o
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2011-10-11 19:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, linux-ext4, Theodore Ts'o, Andrew Morton,
Arnd Bergmann, Arnaud Lacombe
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build error when CONFIG_BUG is not enabled:
fs/jbd2/transaction.c:1175:3: error: implicit declaration of function '__WARN'
by changing __WARN() to WARN_ON(), as suggested by
Arnaud Lacombe <lacombar@gmail.com>.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Arnaud Lacombe <lacombar@gmail.com>
---
Same build error as reported on 31-AUG-2011 for
linux-next 20110830.
fs/jbd2/transaction.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- next-2011-1011.orig/fs/jbd2/transaction.c
+++ next-2011-1011/fs/jbd2/transaction.c
@@ -27,6 +27,7 @@
#include <linux/highmem.h>
#include <linux/hrtimer.h>
#include <linux/backing-dev.h>
+#include <linux/bug.h>
#include <linux/module.h>
static void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh);
@@ -1171,8 +1172,7 @@ out_unlock_bh:
jbd_unlock_bh_state(bh);
out:
JBUFFER_TRACE(jh, "exit");
- if (ret)
- __WARN(); /* All errors are bugs, so dump the stack */
+ WARN_ON(ret); /* All errors are bugs, so dump the stack */
return ret;
}
^ permalink raw reply [flat|nested] 2+ messages in thread