diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2011-10-27 04:05:13 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-10-27 04:05:13 -0400 |
| commit | 44705754610dbc63503bc7679ff9d9f84978a76f (patch) | |
| tree | b3b58dbc315562ef16f5382ef2212106e7ce6938 | |
| parent | b3ff05690845911cc40387176f0bc5a7af9ef3ff (diff) | |
| download | blackbird-op-linux-44705754610dbc63503bc7679ff9d9f84978a76f.tar.gz blackbird-op-linux-44705754610dbc63503bc7679ff9d9f84978a76f.zip | |
jbd2: fix build when CONFIG_BUG is not enabled
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>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Arnaud Lacombe <lacombar@gmail.com>
| -rw-r--r-- | fs/jbd2/transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index b01fd6104089..1e5c5ead5b0d 100644 --- a/fs/jbd2/transaction.c +++ b/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; } |
