summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5.c
diff options
context:
space:
mode:
authorTrela Maciej <Maciej.Trela@intel.com>2010-03-08 16:02:42 +1100
committerNeilBrown <neilb@suse.de>2010-05-18 15:27:47 +1000
commit54071b3808ee3dc8624d9d6f1b06c4fd5308fa3b (patch)
treeb254ce6625ce3dd472faac0d59edeb9589b30f2b /drivers/md/raid5.c
parent84707f38e767ac470fd82af6c45a8cafe2bd1b9a (diff)
downloadblackbird-op-linux-54071b3808ee3dc8624d9d6f1b06c4fd5308fa3b.tar.gz
blackbird-op-linux-54071b3808ee3dc8624d9d6f1b06c4fd5308fa3b.zip
md:Add support for Raid0->Raid5 takeover
Signed-off-by: Maciej Trela <maciej.trela@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r--drivers/md/raid5.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 10af3715b1fc..bb28fd6b44fe 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -52,6 +52,7 @@
#include <linux/cpu.h>
#include "md.h"
#include "raid5.h"
+#include "raid0.h"
#include "bitmap.h"
/*
@@ -5619,6 +5620,21 @@ static void raid5_quiesce(mddev_t *mddev, int state)
}
+static void *raid5_takeover_raid0(mddev_t *mddev)
+{
+
+ mddev->new_level = 5;
+ mddev->new_layout = ALGORITHM_PARITY_N;
+ mddev->new_chunk_sectors = mddev->chunk_sectors;
+ mddev->raid_disks += 1;
+ mddev->delta_disks = 1;
+ /* make sure it will be not marked as dirty */
+ mddev->recovery_cp = MaxSector;
+
+ return setup_conf(mddev);
+}
+
+
static void *raid5_takeover_raid1(mddev_t *mddev)
{
int chunksect;
@@ -5748,6 +5764,16 @@ static void *raid5_takeover(mddev_t *mddev)
* raid4 - trivial - just use a raid4 layout.
* raid6 - Providing it is a *_6 layout
*/
+ if (mddev->level == 0) {
+ /* for raid0 takeover only one zone is supported */
+ struct raid0_private_data *raid0_priv
+ = mddev->private;
+ if (raid0_priv->nr_strip_zones > 1) {
+ printk(KERN_ERR "md: cannot takeover raid 0 with more than one zone.\n");
+ return ERR_PTR(-EINVAL);
+ }
+ return raid5_takeover_raid0(mddev);
+ }
if (mddev->level == 1)
return raid5_takeover_raid1(mddev);
OpenPOWER on IntegriCloud