summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-04-21 15:52:46 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-21 15:52:46 -0400
commit1e09ae544eb1a2d11b04c6924f738a310c7a7a2b (patch)
treed5be98602097f1e3b050f6f2b32ac0ecac53cea2 /fs
parent1dde2dbfc70001e2f86b6581baac2f48900b80ed (diff)
downloadlinux-1e09ae544eb1a2d11b04c6924f738a310c7a7a2b.tar.bz2
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/util.c1
-rw-r--r--fs/gfs2/util.h1
2 files changed, 1 insertions, 1 deletions
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)