diff options
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 4ce0d7502fad..e4e98f47865d 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -733,7 +733,7 @@ static bool stripe_can_batch(struct stripe_head *sh) | |||
733 | { | 733 | { |
734 | struct r5conf *conf = sh->raid_conf; | 734 | struct r5conf *conf = sh->raid_conf; |
735 | 735 | ||
736 | if (conf->log || raid5_has_ppl(conf)) | 736 | if (raid5_has_log(conf) || raid5_has_ppl(conf)) |
737 | return false; | 737 | return false; |
738 | return test_bit(STRIPE_BATCH_READY, &sh->state) && | 738 | return test_bit(STRIPE_BATCH_READY, &sh->state) && |
739 | !test_bit(STRIPE_BITMAP_PENDING, &sh->state) && | 739 | !test_bit(STRIPE_BITMAP_PENDING, &sh->state) && |
@@ -7737,7 +7737,7 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors) | |||
7737 | sector_t newsize; | 7737 | sector_t newsize; |
7738 | struct r5conf *conf = mddev->private; | 7738 | struct r5conf *conf = mddev->private; |
7739 | 7739 | ||
7740 | if (conf->log || raid5_has_ppl(conf)) | 7740 | if (raid5_has_log(conf) || raid5_has_ppl(conf)) |
7741 | return -EINVAL; | 7741 | return -EINVAL; |
7742 | sectors &= ~((sector_t)conf->chunk_sectors - 1); | 7742 | sectors &= ~((sector_t)conf->chunk_sectors - 1); |
7743 | newsize = raid5_size(mddev, sectors, mddev->raid_disks); | 7743 | newsize = raid5_size(mddev, sectors, mddev->raid_disks); |
@@ -7788,7 +7788,7 @@ static int check_reshape(struct mddev *mddev) | |||
7788 | { | 7788 | { |
7789 | struct r5conf *conf = mddev->private; | 7789 | struct r5conf *conf = mddev->private; |
7790 | 7790 | ||
7791 | if (conf->log || raid5_has_ppl(conf)) | 7791 | if (raid5_has_log(conf) || raid5_has_ppl(conf)) |
7792 | return -EINVAL; | 7792 | return -EINVAL; |
7793 | if (mddev->delta_disks == 0 && | 7793 | if (mddev->delta_disks == 0 && |
7794 | mddev->new_layout == mddev->layout && | 7794 | mddev->new_layout == mddev->layout && |