[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 2fc1102..7cd9e25 100644 (file)
--- 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 c9624c3..4532dba 100644 (file)
--- 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)