2011-10-11 19:15:20

by Randy Dunlap

Subject: [PATCH -next] jbd2: fix build when CONFIG_BUG is not enabled

From: Randy Dunlap <[email protected]>

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 <[email protected]>.

Signed-off-by: Randy Dunlap <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Arnaud Lacombe <[email protected]>
---

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;
}

2011-10-27 08:06:11

by Theodore Ts'o

Subject: Re: [PATCH -next] jbd2: fix build when CONFIG_BUG is not enabled

On Tue, Oct 11, 2011 at 12:15:20PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> 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 <[email protected]>.
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Arnd Bergmann <[email protected]>
> Cc: Arnaud Lacombe <[email protected]>

Thanks, applied.

- Ted