diff --git a/[refs] b/[refs] index 0174b6715397..77f0df4eb9ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f73ea87375a1b2bf6c0be82bb9a3cb9d5ee7a407 +refs/heads/master: 001048a318d48e93cb6a1246f3b20335b2a7c855 diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c index 7c7c38058bc2..ac09b7d38553 100644 --- a/trunk/drivers/md/raid0.c +++ b/trunk/drivers/md/raid0.c @@ -592,6 +592,7 @@ static void *raid0_takeover_raid5(mddev_t *mddev) /* Set new parameters */ mddev->new_level = 0; + mddev->new_layout = 0; mddev->new_chunk_sectors = mddev->chunk_sectors; mddev->raid_disks--; mddev->delta_disks = -1; @@ -631,6 +632,7 @@ static void *raid0_takeover_raid10(mddev_t *mddev) /* Set new parameters */ mddev->new_level = 0; + mddev->new_layout = 0; mddev->new_chunk_sectors = mddev->chunk_sectors; mddev->delta_disks = - mddev->raid_disks / 2; mddev->raid_disks += mddev->delta_disks;