git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
s390
/
block
/
dasd_erp.c
diff --git
a/drivers/s390/block/dasd_erp.c
b/drivers/s390/block/dasd_erp.c
index
7cb98d2
..
b842377
100644
(file)
--- a/
drivers/s390/block/dasd_erp.c
+++ b/
drivers/s390/block/dasd_erp.c
@@
-7,7
+7,6
@@
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
*
* Bugreports.to..: <Linux390@de.ibm.com>
* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
*
- * $Revision: 1.14 $
*/
#include <linux/config.h>
*/
#include <linux/config.h>
@@
-33,9
+32,8
@@
dasd_alloc_erp_request(char *magic, int cplength, int datasize,
int size;
/* Sanity checks */
int size;
/* Sanity checks */
- if ( magic == NULL || datasize > PAGE_SIZE ||
- (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
- BUG();
+ BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+ (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
if (cplength > 0)
size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
if (cplength > 0)
@@
-126,8
+124,7
@@
dasd_default_erp_postaction(struct dasd_ccw_req * cqr)
struct dasd_device *device;
int success;
struct dasd_device *device;
int success;
- if (cqr->refers == NULL || cqr->function == NULL)
- BUG();
+ BUG_ON(cqr->refers == NULL || cqr->function == NULL);
device = cqr->device;
success = cqr->status == DASD_CQR_DONE;
device = cqr->device;
success = cqr->status == DASD_CQR_DONE;