From 77bc0f6073f195079c938c04378d6b4106387d1e Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Thu, 27 Oct 2011 04:05:13 -0400
Subject: [PATCH] --- yaml --- r: 273163 b: refs/heads/master c:
 44705754610dbc63503bc7679ff9d9f84978a76f h: refs/heads/master i:   273161:
 5bf5a72c13652ac8a72f8fe0d677c5213f4ab65e   273159:
 61659c32f518a4616da70a7192bd9b7438cd1564 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/jbd2/transaction.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f6b2777fe568..04d07ebe79d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3ff05690845911cc40387176f0bc5a7af9ef3ff
+refs/heads/master: 44705754610dbc63503bc7679ff9d9f84978a76f
diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c
index b01fd6104089..1e5c5ead5b0d 100644
--- a/trunk/fs/jbd2/transaction.c
+++ b/trunk/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 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *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;
 }