From 0f582567f3ba52f6edc5a04865f3191255964445 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 31 Mar 2009 14:57:20 +1100 Subject: [PATCH] --- yaml --- r: 139929 b: refs/heads/master c: fc9739c6d626ee79a148ec367d143b0601299a9d h: refs/heads/master i: 139927: ac816102faf0fb04ce47d2508fd9769a1d8ceaa1 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cd83b4b57625..ea24e20a3fbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9d4758f6e93488dc719a1445ce54659a570938f +refs/heads/master: fc9739c6d626ee79a148ec367d143b0601299a9d diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 95953273c4d9..70b50af2bcd7 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -4912,6 +4912,39 @@ static void *raid5_takeover_raid1(mddev_t *mddev) return setup_conf(mddev); } +static void *raid5_takeover_raid6(mddev_t *mddev) +{ + int new_layout; + + switch (mddev->layout) { + case ALGORITHM_LEFT_ASYMMETRIC_6: + new_layout = ALGORITHM_LEFT_ASYMMETRIC; + break; + case ALGORITHM_RIGHT_ASYMMETRIC_6: + new_layout = ALGORITHM_RIGHT_ASYMMETRIC; + break; + case ALGORITHM_LEFT_SYMMETRIC_6: + new_layout = ALGORITHM_LEFT_SYMMETRIC; + break; + case ALGORITHM_RIGHT_SYMMETRIC_6: + new_layout = ALGORITHM_RIGHT_SYMMETRIC; + break; + case ALGORITHM_PARITY_0_6: + new_layout = ALGORITHM_PARITY_0; + break; + case ALGORITHM_PARITY_N: + new_layout = ALGORITHM_PARITY_N; + break; + default: + return ERR_PTR(-EINVAL); + } + mddev->new_level = 5; + mddev->new_layout = new_layout; + mddev->delta_disks = -1; + mddev->raid_disks -= 1; + return setup_conf(mddev); +} + static int raid5_reconfig(mddev_t *mddev, int new_layout, int new_chunk) { @@ -4972,6 +5005,8 @@ static void *raid5_takeover(mddev_t *mddev) mddev->new_level = 5; return setup_conf(mddev); } + if (mddev->level == 6) + return raid5_takeover_raid6(mddev); return ERR_PTR(-EINVAL); }