|
@@ -91,10 +91,8 @@ static void print_raid6_conf (raid6_conf_t *conf);
|
|
|
static void __release_stripe(raid6_conf_t *conf, struct stripe_head *sh)
|
|
|
{
|
|
|
if (atomic_dec_and_test(&sh->count)) {
|
|
|
- if (!list_empty(&sh->lru))
|
|
|
- BUG();
|
|
|
- if (atomic_read(&conf->active_stripes)==0)
|
|
|
- BUG();
|
|
|
+ BUG_ON(!list_empty(&sh->lru));
|
|
|
+ BUG_ON(atomic_read(&conf->active_stripes)==0);
|
|
|
if (test_bit(STRIPE_HANDLE, &sh->state)) {
|
|
|
if (test_bit(STRIPE_DELAYED, &sh->state))
|
|
|
list_add_tail(&sh->lru, &conf->delayed_list);
|
|
@@ -202,10 +200,8 @@ static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx)
|
|
|
raid6_conf_t *conf = sh->raid_conf;
|
|
|
int disks = conf->raid_disks, i;
|
|
|
|
|
|
- if (atomic_read(&sh->count) != 0)
|
|
|
- BUG();
|
|
|
- if (test_bit(STRIPE_HANDLE, &sh->state))
|
|
|
- BUG();
|
|
|
+ BUG_ON(atomic_read(&sh->count) != 0);
|
|
|
+ BUG_ON(test_bit(STRIPE_HANDLE, &sh->state));
|
|
|
|
|
|
CHECK_DEVLOCK();
|
|
|
PRINTK("init_stripe called, stripe %llu\n",
|
|
@@ -284,13 +280,11 @@ static struct stripe_head *get_active_stripe(raid6_conf_t *conf, sector_t sector
|
|
|
init_stripe(sh, sector, pd_idx);
|
|
|
} else {
|
|
|
if (atomic_read(&sh->count)) {
|
|
|
- if (!list_empty(&sh->lru))
|
|
|
- BUG();
|
|
|
+ BUG_ON(!list_empty(&sh->lru));
|
|
|
} else {
|
|
|
if (!test_bit(STRIPE_HANDLE, &sh->state))
|
|
|
atomic_inc(&conf->active_stripes);
|
|
|
- if (list_empty(&sh->lru))
|
|
|
- BUG();
|
|
|
+ BUG_ON(list_empty(&sh->lru));
|
|
|
list_del_init(&sh->lru);
|
|
|
}
|
|
|
}
|
|
@@ -353,8 +347,7 @@ static int drop_one_stripe(raid6_conf_t *conf)
|
|
|
spin_unlock_irq(&conf->device_lock);
|
|
|
if (!sh)
|
|
|
return 0;
|
|
|
- if (atomic_read(&sh->count))
|
|
|
- BUG();
|
|
|
+ BUG_ON(atomic_read(&sh->count));
|
|
|
shrink_buffers(sh, conf->raid_disks);
|
|
|
kmem_cache_free(conf->slab_cache, sh);
|
|
|
atomic_dec(&conf->active_stripes);
|
|
@@ -780,7 +773,7 @@ static void compute_parity(struct stripe_head *sh, int method)
|
|
|
if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
|
|
|
wake_up(&conf->wait_for_overlap);
|
|
|
|
|
|
- if (sh->dev[i].written) BUG();
|
|
|
+ BUG_ON(sh->dev[i].written);
|
|
|
sh->dev[i].written = chosen;
|
|
|
}
|
|
|
break;
|
|
@@ -970,8 +963,7 @@ static int add_stripe_bio(struct stripe_head *sh, struct bio *bi, int dd_idx, in
|
|
|
if (*bip && (*bip)->bi_sector < bi->bi_sector + ((bi->bi_size)>>9))
|
|
|
goto overlap;
|
|
|
|
|
|
- if (*bip && bi->bi_next && (*bip) != bi->bi_next)
|
|
|
- BUG();
|
|
|
+ BUG_ON(*bip && bi->bi_next && (*bip) != bi->bi_next);
|
|
|
if (*bip)
|
|
|
bi->bi_next = *bip;
|
|
|
*bip = bi;
|
|
@@ -1906,8 +1898,7 @@ static void raid6d (mddev_t *mddev)
|
|
|
|
|
|
list_del_init(first);
|
|
|
atomic_inc(&sh->count);
|
|
|
- if (atomic_read(&sh->count)!= 1)
|
|
|
- BUG();
|
|
|
+ BUG_ON(atomic_read(&sh->count)!= 1);
|
|
|
spin_unlock_irq(&conf->device_lock);
|
|
|
|
|
|
handled++;
|