From 6492c3f2efeaf36df845d40da0e916ef30e4f4bc Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 21 Apr 2006 15:52:46 -0400
Subject: [PATCH] --- yaml --- r: 38659 b: refs/heads/master c:
 1e09ae544eb1a2d11b04c6924f738a310c7a7a2b h: refs/heads/master i:   38657:
 5b1b5bc11926654f99f0288bb1888c9cf602c3c2   38655:
 7b8362b686c6a3a184389ece79fe97e0ecfdaf4d v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/util.c | 1 -
 trunk/fs/gfs2/util.h | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6551ad52015d..27b03d5b42ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dde2dbfc70001e2f86b6581baac2f48900b80ed
+refs/heads/master: 1e09ae544eb1a2d11b04c6924f738a310c7a7a2b
diff --git a/trunk/fs/gfs2/util.c b/trunk/fs/gfs2/util.c
index 2fc110208d00..7cd9e25639c4 100644
--- a/trunk/fs/gfs2/util.c
+++ b/trunk/fs/gfs2/util.c
@@ -32,7 +32,6 @@ void gfs2_assert_i(struct gfs2_sbd *sdp)
 {
 	printk(KERN_EMERG "GFS2: fsid=%s: fatal assertion failed\n",
 	       sdp->sd_fsname);
-	BUG();
 }
 
 /**
diff --git a/trunk/fs/gfs2/util.h b/trunk/fs/gfs2/util.h
index c9624c30cad6..4532dbab0a2c 100644
--- a/trunk/fs/gfs2/util.h
+++ b/trunk/fs/gfs2/util.h
@@ -30,6 +30,7 @@ void gfs2_assert_i(struct gfs2_sbd *sdp);
 do { \
 	if (unlikely(!(assertion))) { \
 		gfs2_assert_i(sdp); \
+		BUG(); \
         } \
 } while (0)