From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Sun, 2 Apr 2006 11:40:13 +0000 (+0200)
Subject: BUG_ON() Conversion in fs/udf/
X-Git-Tag: v2.6.17-rc1~10^2~10
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=2c2111c2bd821d3e7cf5a6a37a112a620fd947a3;p=linux-2.6-omap-h63xx.git

BUG_ON() Conversion in fs/udf/

this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 81e0e8459af..2983afd5e7f 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -312,12 +312,10 @@ static int udf_get_block(struct inode *inode, sector_t block, struct buffer_head
 	err = 0;
 
 	bh = inode_getblk(inode, block, &err, &phys, &new);
-	if (bh)
-		BUG();
+	BUG_ON(bh);
 	if (err)
 		goto abort;
-	if (!phys)
-		BUG();
+	BUG_ON(!phys);
 
 	if (new)
 		set_buffer_new(bh_result);