watchdog: s3c2410_wdt - Add extra option to include watchdog for Samsung SoCs
[safe/jmp/linux-2.6] / drivers / md / raid0.c
index 07ef936..e70f004 100644 (file)
 
 #include <linux/blkdev.h>
 #include <linux/seq_file.h>
+#include <linux/slab.h>
 #include "md.h"
 #include "raid0.h"
+#include "raid5.h"
 
 static void raid0_unplug(struct request_queue *q)
 {
        mddev_t *mddev = q->queuedata;
-       raid0_conf_t *conf = mddev_to_conf(mddev);
-       mdk_rdev_t **devlist = conf->strip_zone[0].dev;
+       raid0_conf_t *conf = mddev->private;
+       mdk_rdev_t **devlist = conf->devlist;
+       int raid_disks = conf->strip_zone[0].nb_dev;
        int i;
 
-       for (i=0; i<mddev->raid_disks; i++) {
+       for (i=0; i < raid_disks; i++) {
                struct request_queue *r_queue = bdev_get_queue(devlist[i]->bdev);
 
                blk_unplug(r_queue);
@@ -40,11 +43,15 @@ static void raid0_unplug(struct request_queue *q)
 static int raid0_congested(void *data, int bits)
 {
        mddev_t *mddev = data;
-       raid0_conf_t *conf = mddev_to_conf(mddev);
-       mdk_rdev_t **devlist = conf->strip_zone[0].dev;
+       raid0_conf_t *conf = mddev->private;
+       mdk_rdev_t **devlist = conf->devlist;
+       int raid_disks = conf->strip_zone[0].nb_dev;
        int i, ret = 0;
 
-       for (i = 0; i < mddev->raid_disks && !ret ; i++) {
+       if (mddev_congested(mddev, bits))
+               return 1;
+
+       for (i = 0; i < raid_disks && !ret ; i++) {
                struct request_queue *q = bdev_get_queue(devlist[i]->bdev);
 
                ret |= bdi_congested(&q->backing_dev_info, bits);
@@ -52,11 +59,44 @@ static int raid0_congested(void *data, int bits)
        return ret;
 }
 
-static int create_strip_zones(mddev_t *mddev)
+/*
+ * inform the user of the raid configuration
+*/
+static void dump_zones(mddev_t *mddev)
+{
+       int j, k, h;
+       sector_t zone_size = 0;
+       sector_t zone_start = 0;
+       char b[BDEVNAME_SIZE];
+       raid0_conf_t *conf = mddev->private;
+       int raid_disks = conf->strip_zone[0].nb_dev;
+       printk(KERN_INFO "******* %s configuration *********\n",
+               mdname(mddev));
+       h = 0;
+       for (j = 0; j < conf->nr_strip_zones; j++) {
+               printk(KERN_INFO "zone%d=[", j);
+               for (k = 0; k < conf->strip_zone[j].nb_dev; k++)
+                       printk(KERN_CONT "%s/",
+                       bdevname(conf->devlist[j*raid_disks
+                                               + k]->bdev, b));
+               printk(KERN_CONT "]\n");
+
+               zone_size  = conf->strip_zone[j].zone_end - zone_start;
+               printk(KERN_INFO "        zone offset=%llukb "
+                               "device offset=%llukb size=%llukb\n",
+                       (unsigned long long)zone_start>>1,
+                       (unsigned long long)conf->strip_zone[j].dev_start>>1,
+                       (unsigned long long)zone_size>>1);
+               zone_start = conf->strip_zone[j].zone_end;
+       }
+       printk(KERN_INFO "**********************************\n\n");
+}
+
+static int create_strip_zones(mddev_t *mddev, raid0_conf_t **private_conf)
 {
-       int i, c, j, err;
+       int i, c, err;
        sector_t curr_zone_end, sectors;
-       mdk_rdev_t *smallest, *rdev1, *rdev2, *rdev;
+       mdk_rdev_t *smallest, *rdev1, *rdev2, *rdev, **dev;
        struct strip_zone *zone;
        int cnt;
        char b[BDEVNAME_SIZE];
@@ -65,18 +105,27 @@ static int create_strip_zones(mddev_t *mddev)
        if (!conf)
                return -ENOMEM;
        list_for_each_entry(rdev1, &mddev->disks, same_set) {
-               printk(KERN_INFO "raid0: looking at %s\n",
-                       bdevname(rdev1->bdev,b));
+               printk(KERN_INFO "md/raid0:%s: looking at %s\n",
+                      mdname(mddev),
+                      bdevname(rdev1->bdev, b));
                c = 0;
+
+               /* round size to chunk_size */
+               sectors = rdev1->sectors;
+               sector_div(sectors, mddev->chunk_sectors);
+               rdev1->sectors = sectors * mddev->chunk_sectors;
+
                list_for_each_entry(rdev2, &mddev->disks, same_set) {
-                       printk(KERN_INFO "raid0:   comparing %s(%llu)",
+                       printk(KERN_INFO "md/raid0:%s:   comparing %s(%llu)",
+                              mdname(mddev),
                               bdevname(rdev1->bdev,b),
                               (unsigned long long)rdev1->sectors);
-                       printk(KERN_INFO " with %s(%llu)\n",
+                       printk(KERN_CONT " with %s(%llu)\n",
                               bdevname(rdev2->bdev,b),
                               (unsigned long long)rdev2->sectors);
                        if (rdev2 == rdev1) {
-                               printk(KERN_INFO "raid0:   END\n");
+                               printk(KERN_INFO "md/raid0:%s:   END\n",
+                                      mdname(mddev));
                                break;
                        }
                        if (rdev2->sectors == rdev1->sectors) {
@@ -84,20 +133,24 @@ static int create_strip_zones(mddev_t *mddev)
                                 * Not unique, don't count it as a new
                                 * group
                                 */
-                               printk(KERN_INFO "raid0:   EQUAL\n");
+                               printk(KERN_INFO "md/raid0:%s:   EQUAL\n",
+                                      mdname(mddev));
                                c = 1;
                                break;
                        }
-                       printk(KERN_INFO "raid0:   NOT EQUAL\n");
+                       printk(KERN_INFO "md/raid0:%s:   NOT EQUAL\n",
+                              mdname(mddev));
                }
                if (!c) {
-                       printk(KERN_INFO "raid0:   ==> UNIQUE\n");
+                       printk(KERN_INFO "md/raid0:%s:   ==> UNIQUE\n",
+                              mdname(mddev));
                        conf->nr_strip_zones++;
-                       printk(KERN_INFO "raid0: %d zones\n",
-                               conf->nr_strip_zones);
+                       printk(KERN_INFO "md/raid0:%s: %d zones\n",
+                              mdname(mddev), conf->nr_strip_zones);
                }
        }
-       printk(KERN_INFO "raid0: FINAL %d zones\n", conf->nr_strip_zones);
+       printk(KERN_INFO "md/raid0:%s: FINAL %d zones\n",
+              mdname(mddev), conf->nr_strip_zones);
        err = -ENOMEM;
        conf->strip_zone = kzalloc(sizeof(struct strip_zone)*
                                conf->nr_strip_zones, GFP_KERNEL);
@@ -115,41 +168,46 @@ static int create_strip_zones(mddev_t *mddev)
        zone = &conf->strip_zone[0];
        cnt = 0;
        smallest = NULL;
-       zone->dev = conf->devlist;
+       dev = conf->devlist;
        err = -EINVAL;
        list_for_each_entry(rdev1, &mddev->disks, same_set) {
                int j = rdev1->raid_disk;
 
+               if (mddev->level == 10)
+                       /* taking over a raid10-n2 array */
+                       j /= 2;
+
                if (j < 0 || j >= mddev->raid_disks) {
-                       printk(KERN_ERR "raid0: bad disk number %d - "
-                               "aborting!\n", j);
+                       printk(KERN_ERR "md/raid0:%s: bad disk number %d - "
+                              "aborting!\n", mdname(mddev), j);
                        goto abort;
                }
-               if (zone->dev[j]) {
-                       printk(KERN_ERR "raid0: multiple devices for %d - "
-                               "aborting!\n", j);
+               if (dev[j]) {
+                       printk(KERN_ERR "md/raid0:%s: multiple devices for %d - "
+                              "aborting!\n", mdname(mddev), j);
                        goto abort;
                }
-               zone->dev[j] = rdev1;
+               dev[j] = rdev1;
 
-               blk_queue_stack_limits(mddev->queue,
-                                      rdev1->bdev->bd_disk->queue);
+               disk_stack_limits(mddev->gendisk, rdev1->bdev,
+                                 rdev1->data_offset << 9);
                /* as we don't honour merge_bvec_fn, we must never risk
-                * violating it, so limit ->max_sector to one PAGE, as
-                * a one page request is never in violation.
+                * violating it, so limit ->max_segments to 1, lying within
+                * a single page.
                 */
 
-               if (rdev1->bdev->bd_disk->queue->merge_bvec_fn &&
-                   queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                       blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
-
+               if (rdev1->bdev->bd_disk->queue->merge_bvec_fn) {
+                       blk_queue_max_segments(mddev->queue, 1);
+                       blk_queue_segment_boundary(mddev->queue,
+                                                  PAGE_CACHE_SIZE - 1);
+               }
                if (!smallest || (rdev1->sectors < smallest->sectors))
                        smallest = rdev1;
                cnt++;
        }
        if (cnt != mddev->raid_disks) {
-               printk(KERN_ERR "raid0: too few disks (%d of %d) - "
-                       "aborting!\n", cnt, mddev->raid_disks);
+               printk(KERN_ERR "md/raid0:%s: too few disks (%d of %d) - "
+                      "aborting!\n", mdname(mddev), cnt, mddev->raid_disks);
                goto abort;
        }
        zone->nb_dev = cnt;
@@ -160,56 +218,78 @@ static int create_strip_zones(mddev_t *mddev)
        /* now do the other zones */
        for (i = 1; i < conf->nr_strip_zones; i++)
        {
+               int j;
+
                zone = conf->strip_zone + i;
-               zone->dev = conf->strip_zone[i-1].dev + mddev->raid_disks;
+               dev = conf->devlist + i * mddev->raid_disks;
 
-               printk(KERN_INFO "raid0: zone %d\n", i);
+               printk(KERN_INFO "md/raid0:%s: zone %d\n",
+                      mdname(mddev), i);
                zone->dev_start = smallest->sectors;
                smallest = NULL;
                c = 0;
 
                for (j=0; j<cnt; j++) {
-                       char b[BDEVNAME_SIZE];
-                       rdev = conf->strip_zone[0].dev[j];
-                       printk(KERN_INFO "raid0: checking %s ...",
-                               bdevname(rdev->bdev, b));
+                       rdev = conf->devlist[j];
+                       printk(KERN_INFO "md/raid0:%s: checking %s ...",
+                              mdname(mddev),
+                              bdevname(rdev->bdev, b));
                        if (rdev->sectors <= zone->dev_start) {
-                               printk(KERN_INFO " nope.\n");
+                               printk(KERN_CONT " nope.\n");
                                continue;
                        }
-                       printk(KERN_INFO " contained as device %d\n", c);
-                       zone->dev[c] = rdev;
+                       printk(KERN_CONT " contained as device %d\n", c);
+                       dev[c] = rdev;
                        c++;
                        if (!smallest || rdev->sectors < smallest->sectors) {
                                smallest = rdev;
-                               printk(KERN_INFO "  (%llu) is smallest!.\n",
-                                       (unsigned long long)rdev->sectors);
+                               printk(KERN_INFO "md/raid0:%s:  (%llu) is smallest!.\n",
+                                      mdname(mddev),
+                                      (unsigned long long)rdev->sectors);
                        }
                }
 
                zone->nb_dev = c;
                sectors = (smallest->sectors - zone->dev_start) * c;
-               printk(KERN_INFO "raid0: zone->nb_dev: %d, sectors: %llu\n",
-                       zone->nb_dev, (unsigned long long)sectors);
+               printk(KERN_INFO "md/raid0:%s: zone->nb_dev: %d, sectors: %llu\n",
+                      mdname(mddev),
+                      zone->nb_dev, (unsigned long long)sectors);
 
                curr_zone_end += sectors;
                zone->zone_end = curr_zone_end;
 
-               printk(KERN_INFO "raid0: current zone start: %llu\n",
-                       (unsigned long long)smallest->sectors);
+               printk(KERN_INFO "md/raid0:%s: current zone start: %llu\n",
+                      mdname(mddev),
+                      (unsigned long long)smallest->sectors);
        }
        mddev->queue->unplug_fn = raid0_unplug;
        mddev->queue->backing_dev_info.congested_fn = raid0_congested;
        mddev->queue->backing_dev_info.congested_data = mddev;
 
-       printk(KERN_INFO "raid0: done.\n");
-       mddev->private = conf;
+       /*
+        * now since we have the hard sector sizes, we can make sure
+        * chunk size is a multiple of that sector size
+        */
+       if ((mddev->chunk_sectors << 9) % queue_logical_block_size(mddev->queue)) {
+               printk(KERN_ERR "md/raid0:%s: chunk_size of %d not valid\n",
+                      mdname(mddev),
+                      mddev->chunk_sectors << 9);
+               goto abort;
+       }
+
+       blk_queue_io_min(mddev->queue, mddev->chunk_sectors << 9);
+       blk_queue_io_opt(mddev->queue,
+                        (mddev->chunk_sectors << 9) * mddev->raid_disks);
+
+       printk(KERN_INFO "md/raid0:%s: done.\n", mdname(mddev));
+       *private_conf = conf;
+
        return 0;
 abort:
        kfree(conf->strip_zone);
        kfree(conf->devlist);
        kfree(conf);
-       mddev->private = NULL;
+       *private_conf = NULL;
        return err;
 }
 
@@ -228,10 +308,15 @@ static int raid0_mergeable_bvec(struct request_queue *q,
        mddev_t *mddev = q->queuedata;
        sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
        int max;
-       unsigned int chunk_sectors = mddev->chunk_size >> 9;
+       unsigned int chunk_sectors = mddev->chunk_sectors;
        unsigned int bio_sectors = bvm->bi_size >> 9;
 
-       max =  (chunk_sectors - ((sector & (chunk_sectors - 1)) + bio_sectors)) << 9;
+       if (is_power_of_2(chunk_sectors))
+               max =  (chunk_sectors - ((sector & (chunk_sectors-1))
+                                               + bio_sectors)) << 9;
+       else
+               max =  (chunk_sectors - (sector_div(sector, chunk_sectors)
+                                               + bio_sectors)) << 9;
        if (max < 0) max = 0; /* bio_add cannot handle a negative return */
        if (max <= biovec->bv_len && bio_sectors == 0)
                return biovec->bv_len;
@@ -255,29 +340,40 @@ static sector_t raid0_size(mddev_t *mddev, sector_t sectors, int raid_disks)
 
 static int raid0_run(mddev_t *mddev)
 {
+       raid0_conf_t *conf;
        int ret;
 
-       if (mddev->chunk_size == 0) {
-               printk(KERN_ERR "md/raid0: non-zero chunk size required.\n");
+       if (mddev->chunk_sectors == 0) {
+               printk(KERN_ERR "md/raid0:%s: chunk size must be set.\n",
+                      mdname(mddev));
                return -EINVAL;
        }
-       printk(KERN_INFO "%s: setting max_sectors to %d, segment boundary to %d\n",
-              mdname(mddev),
-              mddev->chunk_size >> 9,
-              (mddev->chunk_size>>1)-1);
-       blk_queue_max_sectors(mddev->queue, mddev->chunk_size >> 9);
-       blk_queue_segment_boundary(mddev->queue, (mddev->chunk_size>>1) - 1);
+       if (md_check_no_bitmap(mddev))
+               return -EINVAL;
+       blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors);
        mddev->queue->queue_lock = &mddev->queue->__queue_lock;
 
-       ret = create_strip_zones(mddev);
-       if (ret < 0)
-               return ret;
+       /* if private is not null, we are here after takeover */
+       if (mddev->private == NULL) {
+               ret = create_strip_zones(mddev, &conf);
+               if (ret < 0)
+                       return ret;
+               mddev->private = conf;
+       }
+       conf = mddev->private;
+       if (conf->scale_raid_disks) {
+               int i;
+               for (i=0; i < conf->strip_zone[0].nb_dev; i++)
+                       conf->devlist[i]->raid_disk /= conf->scale_raid_disks;
+               /* FIXME update sysfs rd links */
+       }
 
        /* calculate array device size */
        md_set_array_sectors(mddev, raid0_size(mddev, 0, 0));
 
-       printk(KERN_INFO "raid0 : md_size is %llu sectors.\n",
-               (unsigned long long)mddev->array_sectors);
+       printk(KERN_INFO "md/raid0:%s: md_size is %llu sectors.\n",
+              mdname(mddev),
+              (unsigned long long)mddev->array_sectors);
        /* calculate the max read-ahead size.
         * For read-ahead of large files to be effective, we need to
         * readahead at least twice a whole stripe. i.e. number of devices
@@ -288,18 +384,21 @@ static int raid0_run(mddev_t *mddev)
         * chunksize should be used in that case.
         */
        {
-               int stripe = mddev->raid_disks * mddev->chunk_size / PAGE_SIZE;
+               int stripe = mddev->raid_disks *
+                       (mddev->chunk_sectors << 9) / PAGE_SIZE;
                if (mddev->queue->backing_dev_info.ra_pages < 2* stripe)
                        mddev->queue->backing_dev_info.ra_pages = 2* stripe;
        }
 
        blk_queue_merge_bvec(mddev->queue, raid0_mergeable_bvec);
+       dump_zones(mddev);
+       md_integrity_register(mddev);
        return 0;
 }
 
 static int raid0_stop(mddev_t *mddev)
 {
-       raid0_conf_t *conf = mddev_to_conf(mddev);
+       raid0_conf_t *conf = mddev->private;
 
        blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
        kfree(conf->strip_zone);
@@ -328,34 +427,74 @@ static struct strip_zone *find_zone(struct raid0_private_data *conf,
        BUG();
 }
 
-static int raid0_make_request (struct request_queue *q, struct bio *bio)
+/*
+ * remaps the bio to the target device. we separate two flows.
+ * power 2 flow and a general flow for the sake of perfromance
+*/
+static mdk_rdev_t *map_sector(mddev_t *mddev, struct strip_zone *zone,
+                               sector_t sector, sector_t *sector_offset)
 {
-       mddev_t *mddev = q->queuedata;
-       unsigned int sect_in_chunk, chunksect_bits, chunk_sects;
-       raid0_conf_t *conf = mddev_to_conf(mddev);
-       struct strip_zone *zone;
-       mdk_rdev_t *tmp_dev;
+       unsigned int sect_in_chunk;
        sector_t chunk;
-       sector_t sector, rsect, sector_offset;
-       const int rw = bio_data_dir(bio);
-       int cpu;
+       raid0_conf_t *conf = mddev->private;
+       int raid_disks = conf->strip_zone[0].nb_dev;
+       unsigned int chunk_sects = mddev->chunk_sectors;
+
+       if (is_power_of_2(chunk_sects)) {
+               int chunksect_bits = ffz(~chunk_sects);
+               /* find the sector offset inside the chunk */
+               sect_in_chunk  = sector & (chunk_sects - 1);
+               sector >>= chunksect_bits;
+               /* chunk in zone */
+               chunk = *sector_offset;
+               /* quotient is the chunk in real device*/
+               sector_div(chunk, zone->nb_dev << chunksect_bits);
+       } else{
+               sect_in_chunk = sector_div(sector, chunk_sects);
+               chunk = *sector_offset;
+               sector_div(chunk, chunk_sects * zone->nb_dev);
+       }
+       /*
+       *  position the bio over the real device
+       *  real sector = chunk in device + starting of zone
+       *       + the position in the chunk
+       */
+       *sector_offset = (chunk * chunk_sects) + sect_in_chunk;
+       return conf->devlist[(zone - conf->strip_zone)*raid_disks
+                            + sector_div(sector, zone->nb_dev)];
+}
 
-       if (unlikely(bio_barrier(bio))) {
-               bio_endio(bio, -EOPNOTSUPP);
-               return 0;
+/*
+ * Is io distribute over 1 or more chunks ?
+*/
+static inline int is_io_in_chunk_boundary(mddev_t *mddev,
+                       unsigned int chunk_sects, struct bio *bio)
+{
+       if (likely(is_power_of_2(chunk_sects))) {
+               return chunk_sects >= ((bio->bi_sector & (chunk_sects-1))
+                                       + (bio->bi_size >> 9));
+       } else{
+               sector_t sector = bio->bi_sector;
+               return chunk_sects >= (sector_div(sector, chunk_sects)
+                                               + (bio->bi_size >> 9));
        }
+}
 
-       cpu = part_stat_lock();
-       part_stat_inc(cpu, &mddev->gendisk->part0, ios[rw]);
-       part_stat_add(cpu, &mddev->gendisk->part0, sectors[rw],
-                     bio_sectors(bio));
-       part_stat_unlock();
+static int raid0_make_request(mddev_t *mddev, struct bio *bio)
+{
+       unsigned int chunk_sects;
+       sector_t sector_offset;
+       struct strip_zone *zone;
+       mdk_rdev_t *tmp_dev;
 
-       chunk_sects = mddev->chunk_size >> 9;
-       chunksect_bits = ffz(~chunk_sects);
-       sector = bio->bi_sector;
+       if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER))) {
+               md_barrier_request(mddev, bio);
+               return 0;
+       }
 
-       if (unlikely(chunk_sects < (bio->bi_sector & (chunk_sects - 1)) + (bio->bi_size >> 9))) {
+       chunk_sects = mddev->chunk_sectors;
+       if (unlikely(!is_io_in_chunk_boundary(mddev, chunk_sects, bio))) {
+               sector_t sector = bio->bi_sector;
                struct bio_pair *bp;
                /* Sanity check -- queue functions should prevent this happening */
                if (bio->bi_vcnt != 1 ||
@@ -364,72 +503,174 @@ static int raid0_make_request (struct request_queue *q, struct bio *bio)
                /* This is a one page bio that upper layers
                 * refuse to split for us, so we need to split it.
                 */
-               bp = bio_split(bio, chunk_sects - (bio->bi_sector & (chunk_sects - 1)));
-               if (raid0_make_request(q, &bp->bio1))
+               if (likely(is_power_of_2(chunk_sects)))
+                       bp = bio_split(bio, chunk_sects - (sector &
+                                                          (chunk_sects-1)));
+               else
+                       bp = bio_split(bio, chunk_sects -
+                                      sector_div(sector, chunk_sects));
+               if (raid0_make_request(mddev, &bp->bio1))
                        generic_make_request(&bp->bio1);
-               if (raid0_make_request(q, &bp->bio2))
+               if (raid0_make_request(mddev, &bp->bio2))
                        generic_make_request(&bp->bio2);
 
                bio_pair_release(bp);
                return 0;
        }
-       sector_offset = sector;
-       zone = find_zone(conf, &sector_offset);
-       sect_in_chunk = bio->bi_sector & (chunk_sects - 1);
-       {
-               sector_t x = sector_offset >> chunksect_bits;
-
-               sector_div(x, zone->nb_dev);
-               chunk = x;
 
-               x = sector >> chunksect_bits;
-               tmp_dev = zone->dev[sector_div(x, zone->nb_dev)];
-       }
-       rsect = (chunk << chunksect_bits) + zone->dev_start + sect_in_chunk;
+       sector_offset = bio->bi_sector;
+       zone =  find_zone(mddev->private, &sector_offset);
+       tmp_dev = map_sector(mddev, zone, bio->bi_sector,
+                            &sector_offset);
        bio->bi_bdev = tmp_dev->bdev;
-       bio->bi_sector = rsect + tmp_dev->data_offset;
-
+       bio->bi_sector = sector_offset + zone->dev_start +
+               tmp_dev->data_offset;
        /*
         * Let the main block layer submit the IO and resolve recursion:
         */
        return 1;
 
 bad_map:
-       printk("raid0_make_request bug: can't convert block across chunks"
-               " or bigger than %dk %llu %d\n", chunk_sects / 2,
-               (unsigned long long)bio->bi_sector, bio->bi_size >> 10);
+       printk("md/raid0:%s: make_request bug: can't convert block across chunks"
+              " or bigger than %dk %llu %d\n",
+              mdname(mddev), chunk_sects / 2,
+              (unsigned long long)bio->bi_sector, bio->bi_size >> 10);
 
        bio_io_error(bio);
        return 0;
 }
 
-static void raid0_status (struct seq_file *seq, mddev_t *mddev)
+static void raid0_status(struct seq_file *seq, mddev_t *mddev)
 {
 #undef MD_DEBUG
 #ifdef MD_DEBUG
        int j, k, h;
        char b[BDEVNAME_SIZE];
-       raid0_conf_t *conf = mddev_to_conf(mddev);
+       raid0_conf_t *conf = mddev->private;
+       int raid_disks = conf->strip_zone[0].nb_dev;
 
+       sector_t zone_size;
+       sector_t zone_start = 0;
        h = 0;
+
        for (j = 0; j < conf->nr_strip_zones; j++) {
                seq_printf(seq, "      z%d", j);
                seq_printf(seq, "=[");
                for (k = 0; k < conf->strip_zone[j].nb_dev; k++)
                        seq_printf(seq, "%s/", bdevname(
-                               conf->strip_zone[j].dev[k]->bdev,b));
-
-               seq_printf(seq, "] ze=%d ds=%d s=%d\n",
-                               conf->strip_zone[j].zone_end,
-                               conf->strip_zone[j].dev_start,
-                               conf->strip_zone[j].sectors);
+                               conf->devlist[j*raid_disks + k]
+                                               ->bdev, b));
+
+               zone_size  = conf->strip_zone[j].zone_end - zone_start;
+               seq_printf(seq, "] ze=%lld ds=%lld s=%lld\n",
+                       (unsigned long long)zone_start>>1,
+                       (unsigned long long)conf->strip_zone[j].dev_start>>1,
+                       (unsigned long long)zone_size>>1);
+               zone_start = conf->strip_zone[j].zone_end;
        }
 #endif
-       seq_printf(seq, " %dk chunks", mddev->chunk_size/1024);
+       seq_printf(seq, " %dk chunks", mddev->chunk_sectors / 2);
        return;
 }
 
+static void *raid0_takeover_raid5(mddev_t *mddev)
+{
+       mdk_rdev_t *rdev;
+       raid0_conf_t *priv_conf;
+
+       if (mddev->degraded != 1) {
+               printk(KERN_ERR "md/raid0:%s: raid5 must be degraded! Degraded disks: %d\n",
+                      mdname(mddev),
+                      mddev->degraded);
+               return ERR_PTR(-EINVAL);
+       }
+
+       list_for_each_entry(rdev, &mddev->disks, same_set) {
+               /* check slot number for a disk */
+               if (rdev->raid_disk == mddev->raid_disks-1) {
+                       printk(KERN_ERR "md/raid0:%s: raid5 must have missing parity disk!\n",
+                              mdname(mddev));
+                       return ERR_PTR(-EINVAL);
+               }
+       }
+
+       /* Set new parameters */
+       mddev->new_level = 0;
+       mddev->new_chunk_sectors = mddev->chunk_sectors;
+       mddev->raid_disks--;
+       mddev->delta_disks = -1;
+       /* make sure it will be not marked as dirty */
+       mddev->recovery_cp = MaxSector;
+
+       create_strip_zones(mddev, &priv_conf);
+       return priv_conf;
+}
+
+static void *raid0_takeover_raid10(mddev_t *mddev)
+{
+       raid0_conf_t *priv_conf;
+
+       /* Check layout:
+        *  - far_copies must be 1
+        *  - near_copies must be 2
+        *  - disks number must be even
+        *  - all mirrors must be already degraded
+        */
+       if (mddev->layout != ((1 << 8) + 2)) {
+               printk(KERN_ERR "md/raid0:%s:: Raid0 cannot takover layout: 0x%x\n",
+                      mdname(mddev),
+                      mddev->layout);
+               return ERR_PTR(-EINVAL);
+       }
+       if (mddev->raid_disks & 1) {
+               printk(KERN_ERR "md/raid0:%s: Raid0 cannot takover Raid10 with odd disk number.\n",
+                      mdname(mddev));
+               return ERR_PTR(-EINVAL);
+       }
+       if (mddev->degraded != (mddev->raid_disks>>1)) {
+               printk(KERN_ERR "md/raid0:%s: All mirrors must be already degraded!\n",
+                      mdname(mddev));
+               return ERR_PTR(-EINVAL);
+       }
+
+       /* Set new parameters */
+       mddev->new_level = 0;
+       mddev->new_chunk_sectors = mddev->chunk_sectors;
+       mddev->delta_disks = - mddev->raid_disks / 2;
+       mddev->raid_disks += mddev->delta_disks;
+       mddev->degraded = 0;
+       /* make sure it will be not marked as dirty */
+       mddev->recovery_cp = MaxSector;
+
+       create_strip_zones(mddev, &priv_conf);
+       priv_conf->scale_raid_disks = 2;
+       return priv_conf;
+}
+
+static void *raid0_takeover(mddev_t *mddev)
+{
+       /* raid0 can take over:
+        *  raid5 - providing it is Raid4 layout and one disk is faulty
+        *  raid10 - assuming we have all necessary active disks
+        */
+       if (mddev->level == 5) {
+               if (mddev->layout == ALGORITHM_PARITY_N)
+                       return raid0_takeover_raid5(mddev);
+
+               printk(KERN_ERR "md/raid0:%s: Raid can only takeover Raid5 with layout: %d\n",
+                      mdname(mddev), ALGORITHM_PARITY_N);
+       }
+
+       if (mddev->level == 10)
+               return raid0_takeover_raid10(mddev);
+
+       return ERR_PTR(-EINVAL);
+}
+
+static void raid0_quiesce(mddev_t *mddev, int state)
+{
+}
+
 static struct mdk_personality raid0_personality=
 {
        .name           = "raid0",
@@ -440,6 +681,8 @@ static struct mdk_personality raid0_personality=
        .stop           = raid0_stop,
        .status         = raid0_status,
        .size           = raid0_size,
+       .takeover       = raid0_takeover,
+       .quiesce        = raid0_quiesce,
 };
 
 static int __init raid0_init (void)
@@ -455,6 +698,7 @@ static void raid0_exit (void)
 module_init(raid0_init);
 module_exit(raid0_exit);
 MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("RAID0 (striping) personality for MD");
 MODULE_ALIAS("md-personality-2"); /* RAID0 */
 MODULE_ALIAS("md-raid0");
 MODULE_ALIAS("md-level-0");