aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-04-02 13:34:29 +0200
committerAdrian Bunk <bunk@stusta.de>2006-04-02 13:34:29 +0200
commitb6385483840e903d99cb753593faea215ae8d324 (patch)
tree9617999432507882287ef4cd2d9be1f20017d6ba /drivers/md
parent43dab9bbe9fda735589f2749004f639349966b20 (diff)
downloadkernel_samsung_crespo-b6385483840e903d99cb753593faea215ae8d324.zip
kernel_samsung_crespo-b6385483840e903d99cb753593faea215ae8d324.tar.gz
kernel_samsung_crespo-b6385483840e903d99cb753593faea215ae8d324.tar.bz2
BUG_ON() Conversion in md/raid10.c
this changes if() BUG(); constructs to BUG_ON() which is cleaner and can better optimized away Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid10.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index ab90a6d..617012b 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1117,8 +1117,7 @@ static int end_sync_read(struct bio *bio, unsigned int bytes_done, int error)
for (i=0; i<conf->copies; i++)
if (r10_bio->devs[i].bio == bio)
break;
- if (i == conf->copies)
- BUG();
+ BUG_ON(i == conf->copies);
update_head_pos(i, r10_bio);
d = r10_bio->devs[i].devnum;
@@ -1518,8 +1517,7 @@ static int init_resync(conf_t *conf)
int buffs;
buffs = RESYNC_WINDOW / RESYNC_BLOCK_SIZE;
- if (conf->r10buf_pool)
- BUG();
+ BUG_ON(conf->r10buf_pool);
conf->r10buf_pool = mempool_create(buffs, r10buf_pool_alloc, r10buf_pool_free, conf);
if (!conf->r10buf_pool)
return -ENOMEM;