From 4bdf368fa58288b68124c3f50e8893a3b993b93b Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Tue, 3 Oct 2006 23:33:23 +0200
Subject: [PATCH] --- yaml --- r: 38326 b: refs/heads/master c:
 52e5f9d1cf0b10b24317037dcd1c9be38ca7011c h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/md.c    | 3 +--
 trunk/drivers/md/raid5.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index da5dcee1e737..da657740542f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70d63ccc71fe1a413ce82b88aa175b1dcf28654e
+refs/heads/master: 52e5f9d1cf0b10b24317037dcd1c9be38ca7011c
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 38a0a5741d52..cb8281605be8 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -4438,8 +4438,7 @@ static int md_release(struct inode *inode, struct file * file)
 {
  	mddev_t *mddev = inode->i_bdev->bd_disk->private_data;
 
-	if (!mddev)
-		BUG();
+	BUG_ON(!mddev);
 	mddev_put(mddev);
 
 	return 0;
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 37e4ff661b6c..e14f45780720 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -1105,7 +1105,7 @@ static void compute_parity6(struct stripe_head *sh, int method)
 				if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
 					wake_up(&conf->wait_for_overlap);
 
-				if (sh->dev[i].written) BUG();
+				BUG_ON(sh->dev[i].written);
 				sh->dev[i].written = chosen;
 			}
 		break;