diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-04-01 01:08:49 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-04-01 01:08:49 +0200 |
| commit | 9e77c485f7037e4817bb53c78d15d5403981ae8b (patch) | |
| tree | 1b9b5bc14576c51ae03daf46b003869497499719 /drivers/md/raid1.c | |
| parent | 543cb2a451918002238a052d5c280e6afdee1cea (diff) | |
| download | linux-3.10-9e77c485f7037e4817bb53c78d15d5403981ae8b.tar.gz linux-3.10-9e77c485f7037e4817bb53c78d15d5403981ae8b.tar.bz2 linux-3.10-9e77c485f7037e4817bb53c78d15d5403981ae8b.zip | |
BUG_ON() Conversion in md/raid1.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/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 9b374c91db6..6081941de1b 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1558,8 +1558,7 @@ static int init_resync(conf_t *conf) int buffs; buffs = RESYNC_WINDOW / RESYNC_BLOCK_SIZE; - if (conf->r1buf_pool) - BUG(); + BUG_ON(conf->r1buf_pool); conf->r1buf_pool = mempool_create(buffs, r1buf_pool_alloc, r1buf_pool_free, conf->poolinfo); if (!conf->r1buf_pool) @@ -1732,8 +1731,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i !conf->fullsync && !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) break; - if (sync_blocks < (PAGE_SIZE>>9)) - BUG(); + BUG_ON(sync_blocks < (PAGE_SIZE>>9)); if (len > (sync_blocks<<9)) len = sync_blocks<<9; } |