---

yaml --- r: 38659 b: refs/heads/master c: 1e09ae5 h: refs/heads/master i: 38657: 5b1b5bc 38655: 7b8362b v: v3
git-mirror · Apr 21, 2006 · 6492c3f · 6492c3f
1 parent c6d0d8e
commit 6492c3f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
@@ -30,6 +30,7 @@ void gfs2_assert_i(struct gfs2_sbd *sdp);
 do { \
 	if (unlikely(!(assertion))) { \
 		gfs2_assert_i(sdp); \
+		BUG(); \
         } \
 } while (0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -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();
     }
     /**
@@ Expand Down @@