aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorMaciej Trela <maciej.trela@intel.com>2010-06-16 06:55:14 -0400
committerNeilBrown <neilb@suse.de>2010-06-23 23:34:45 -0400
commit001048a318d48e93cb6a1246f3b20335b2a7c855 (patch)
tree82a90465d46b9f495ceee52ef24dee9ada3a9827 /drivers/md
parentf73ea87375a1b2bf6c0be82bb9a3cb9d5ee7a407 (diff)
md: clear layout after ->raid0 takeover
After takeover from raid5/10 -> raid0 mddev->layout is not cleared. Signed-off-by: Maciej Trela <maciej.trela@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid0.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 7c7c38058bc2..ac09b7d38553 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -592,6 +592,7 @@ static void *raid0_takeover_raid5(mddev_t *mddev)
592 592
593 /* Set new parameters */ 593 /* Set new parameters */
594 mddev->new_level = 0; 594 mddev->new_level = 0;
595 mddev->new_layout = 0;
595 mddev->new_chunk_sectors = mddev->chunk_sectors; 596 mddev->new_chunk_sectors = mddev->chunk_sectors;
596 mddev->raid_disks--; 597 mddev->raid_disks--;
597 mddev->delta_disks = -1; 598 mddev->delta_disks = -1;
@@ -631,6 +632,7 @@ static void *raid0_takeover_raid10(mddev_t *mddev)
631 632
632 /* Set new parameters */ 633 /* Set new parameters */
633 mddev->new_level = 0; 634 mddev->new_level = 0;
635 mddev->new_layout = 0;
634 mddev->new_chunk_sectors = mddev->chunk_sectors; 636 mddev->new_chunk_sectors = mddev->chunk_sectors;
635 mddev->delta_disks = - mddev->raid_disks / 2; 637 mddev->delta_disks = - mddev->raid_disks / 2;
636 mddev->raid_disks += mddev->delta_disks; 638 mddev->raid_disks += mddev->delta_disks;