From ed6c66ae4f2d4867267fc268742b52aeccdc92ba Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Sat, 1 Apr 2006 01:08:49 +0200 Subject: [PATCH] --- yaml --- r: 25187 b: refs/heads/master c: 9e77c485f7037e4817bb53c78d15d5403981ae8b h: refs/heads/master i: 25185: 58c52f574000fe0f5bd5d7281d74a741222eb6fe 25183: 34121af7da7624f676f9dedfd1d282a94a047c0d v: v3 --- [refs] | 2 +- trunk/drivers/md/raid1.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f6306033fb2b..c941b785e4d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 543cb2a451918002238a052d5c280e6afdee1cea +refs/heads/master: 9e77c485f7037e4817bb53c78d15d5403981ae8b diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index 9b374c91db66..6081941de1b3 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/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; }