From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 21 Apr 2006 19:52:46 +0000 (-0400)
Subject: [GFS2] Move BUG() back into the header file
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1e09ae544eb1a2d11b04c6924f738a310c7a7a2b;p=deliverable%2Flinux.git

[GFS2] Move BUG() back into the header file

In order to make the file and line number reporting work
correctly, this has been moved back into the header file.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index 2fc110208d00..7cd9e25639c4 100644
--- a/fs/gfs2/util.c
+++ b/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/fs/gfs2/util.h b/fs/gfs2/util.h
index c9624c30cad6..4532dbab0a2c 100644
--- a/fs/gfs2/util.h
+++ b/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)