From: Julia Lawall <julia@diku.dk>
Date: Mon, 28 Apr 2008 09:16:02 +0000 (-0700)
Subject: fs/ext2: use BUG_ON
X-Git-Tag: v2.6.26-rc1~761
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2c11619a590e13fecc801c9c50859cba29740f38;p=linux-2.6-omap-h63xx.git

fs/ext2: use BUG_ON

if (...) BUG(); should be replaced with BUG_ON(...) when the test has no
side-effects to allow a definition of BUG_ON that drops the code completely.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@ disable unlikely @ expression E,f; @@

(
  if (<... f(...) ...>) { BUG(); }
|
- if (unlikely(E)) { BUG(); }
+ BUG_ON(E);
)

@@ expression E,f; @@

(
  if (<... f(...) ...>) { BUG(); }
|
- if (E) { BUG(); }
+ BUG_ON(E);
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index e7b2bafa1dd..c834f512dce 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -245,8 +245,7 @@ restart:
 		prev = rsv;
 	}
 	printk("Window map complete.\n");
-	if (bad)
-		BUG();
+	BUG_ON(bad);
 }
 #define rsv_window_dump(root, verbose) \
 	__rsv_window_dump((root), (verbose), __FUNCTION__)
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index a0995eb2dc2..dd9dbb25eab 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -41,8 +41,8 @@ static inline __le16 ext2_rec_len_to_disk(unsigned len)
 {
 	if (len == (1 << 16))
 		return cpu_to_le16(EXT2_MAX_REC_LEN);
-	else if (len > (1 << 16))
-		BUG();
+	else
+		BUG_ON(len > (1 << 16));
 	return cpu_to_le16(len);
 }