From f9e71e01d78c9e49b03a81e3b6dfb32aefc2a5b1 Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Fri, 24 Mar 2006 18:50:27 +0100
Subject: [PATCH] --- yaml --- r: 23688 b: refs/heads/master c:
 089fe1b23da5468bbf02b721472f71f349837a7d h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/DAC960.c     | 3 +--
 trunk/drivers/block/cciss.c      | 3 +--
 trunk/drivers/block/cciss_scsi.c | 2 +-
 trunk/drivers/block/cpqarray.c   | 3 +--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 67e64f37b614..291749adf874 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 817dd6eed4bf40fa14d1e96ac4905efebd5e03f2
+refs/heads/master: 089fe1b23da5468bbf02b721472f71f349837a7d
diff --git a/trunk/drivers/block/DAC960.c b/trunk/drivers/block/DAC960.c
index 37b8cda3e8bc..9bdea2a5cf0e 100644
--- a/trunk/drivers/block/DAC960.c
+++ b/trunk/drivers/block/DAC960.c
@@ -228,8 +228,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len,
 	void *cpu_end = loaf->cpu_free + len;
 	void *cpu_addr = loaf->cpu_free;
 
-	if (cpu_end > loaf->cpu_base + loaf->length)
-		BUG();
+	BUG_ON(cpu_end > loaf->cpu_base + loaf->length);
 	*dma_handle = loaf->dma_free;
 	loaf->cpu_free = cpu_end;
 	loaf->dma_free += len;
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 1f2890989b56..71ec9e664383 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -2361,8 +2361,7 @@ static void do_cciss_request(request_queue_t *q)
 	if (!creq)
 		goto startio;
 
-	if (creq->nr_phys_segments > MAXSGENTRIES)
-                BUG();
+	BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);
 
 	if (( c = cmd_alloc(h, 1)) == NULL)
 		goto full;
diff --git a/trunk/drivers/block/cciss_scsi.c b/trunk/drivers/block/cciss_scsi.c
index 9e35de05d5c5..0e66e904bd8c 100644
--- a/trunk/drivers/block/cciss_scsi.c
+++ b/trunk/drivers/block/cciss_scsi.c
@@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd
 
 	cp->Request.Timeout = 0;
 	memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB));
-	if (cmd->cmd_len > sizeof(cp->Request.CDB)) BUG();
+	BUG_ON(cmd->cmd_len > sizeof(cp->Request.CDB));
 	cp->Request.CDBLen = cmd->cmd_len;
 	memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len);
 	cp->Request.Type.Type = TYPE_CMD;
diff --git a/trunk/drivers/block/cpqarray.c b/trunk/drivers/block/cpqarray.c
index 862b9abac0ae..b6ea2f0c7276 100644
--- a/trunk/drivers/block/cpqarray.c
+++ b/trunk/drivers/block/cpqarray.c
@@ -906,8 +906,7 @@ static void do_ida_request(request_queue_t *q)
 	if (!creq)
 		goto startio;
 
-	if (creq->nr_phys_segments > SG_MAX)
-		BUG();
+	BUG_ON(creq->nr_phys_segments > SG_MAX);
 
 	if ((c = cmd_alloc(h,1)) == NULL)
 		goto startio;