]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-intel.c
Use one function chosing spares from container
[thirdparty/mdadm.git] / super-intel.c
index 10956e6cf046f0ca9d2d637c1f081da79958e0ef..dc3b03d39748f440646b6756583408ccd00b38ab 100644 (file)
@@ -230,9 +230,13 @@ static unsigned int mpb_sectors(struct imsm_super *mpb)
 struct intel_dev {
        struct imsm_dev *dev;
        struct intel_dev *next;
-       int index;
+       unsigned index;
 };
 
+enum action {
+       DISK_REMOVE = 1,
+       DISK_ADD
+};
 /* internal representation of IMSM metadata */
 struct intel_super {
        union {
@@ -258,8 +262,10 @@ struct intel_super {
                int extent_cnt;
                struct extent *e; /* for determining freespace @ create */
                int raiddisk; /* slot to fill in autolayout */
+               enum action action;
        } *disks;
-       struct dl *add; /* list of disks to add while mdmon active */
+       struct dl *disk_mgmt_list; /* list of disks to add/remove while mdmon
+                                     active */
        struct dl *missing; /* disks removed while we weren't looking */
        struct bbm_log *bbm_log;
        const char *hba; /* device path of the raid controller for this metadata */
@@ -282,7 +288,10 @@ struct extent {
 enum imsm_update_type {
        update_activate_spare,
        update_create_array,
-       update_add_disk,
+       update_kill_array,
+       update_rename_array,
+       update_add_remove_disk,
+       update_reshape_container_disks,
 };
 
 struct imsm_update_activate_spare {
@@ -293,6 +302,24 @@ struct imsm_update_activate_spare {
        struct imsm_update_activate_spare *next;
 };
 
+struct geo_params {
+       int dev_id;
+       char *dev_name;
+       long long size;
+       int level;
+       int layout;
+       int chunksize;
+       int raid_disks;
+};
+
+
+struct imsm_update_reshape {
+       enum imsm_update_type type;
+       int old_raid_disks;
+       int new_raid_disks;
+       int new_disks[1]; /* new_raid_disks - old_raid_disks makedev number */
+};
+
 struct disk_info {
        __u8 serial[MAX_RAID_SERIAL_LEN];
 };
@@ -303,7 +330,18 @@ struct imsm_update_create_array {
        struct imsm_dev dev;
 };
 
-struct imsm_update_add_disk {
+struct imsm_update_kill_array {
+       enum imsm_update_type type;
+       int dev_idx;
+};
+
+struct imsm_update_rename_array {
+       enum imsm_update_type type;
+       __u8 name[MAX_RAID_SERIAL_LEN];
+       int dev_idx;
+};
+
+struct imsm_update_add_remove_disk {
        enum imsm_update_type type;
 };
 
@@ -320,6 +358,7 @@ static struct supertype *match_metadata_desc_imsm(char *arg)
        if (!st)
                return NULL;
        memset(st, 0, sizeof(*st));
+       st->container_dev = NoMdDev;
        st->ss = &super_imsm;
        st->max_devs = IMSM_MAX_DEVICES;
        st->minor_version = 0;
@@ -344,19 +383,30 @@ static struct imsm_disk *__get_imsm_disk(struct imsm_super *mpb, __u8 index)
        return &mpb->disk[index];
 }
 
-#ifndef MDASSEMBLE
-/* retrieve a disk from the parsed metadata */
-static struct imsm_disk *get_imsm_disk(struct intel_super *super, __u8 index)
+/* retrieve the disk description based on a index of the disk
+ * in the sub-array
+ */
+static struct dl *get_imsm_dl_disk(struct intel_super *super, __u8 index)
 {
        struct dl *d;
 
        for (d = super->disks; d; d = d->next)
                if (d->index == index)
-                       return &d->disk;
-       
+                       return d;
+
+       return NULL;
+}
+/* retrieve a disk from the parsed metadata */
+static struct imsm_disk *get_imsm_disk(struct intel_super *super, __u8 index)
+{
+       struct dl *dl;
+
+       dl = get_imsm_dl_disk(super, index);
+       if (dl)
+               return &dl->disk;
+
        return NULL;
 }
-#endif
 
 /* generate a checksum directly from the anchor when the anchor is known to be
  * up-to-date, currently only at load or write_super after coalescing
@@ -485,7 +535,7 @@ static void set_imsm_ord_tbl_ent(struct imsm_map *map, int slot, __u32 ord)
        map->disk_ord_tbl[slot] = __cpu_to_le32(ord);
 }
 
-static int get_imsm_disk_slot(struct imsm_map *map, int idx)
+static int get_imsm_disk_slot(struct imsm_map *map, unsigned idx)
 {
        int slot;
        __u32 ord;
@@ -579,7 +629,7 @@ static struct extent *get_extents(struct intel_super *super, struct dl *dl)
                 */
                remainder &= ~1UL;
                /* make sure remainder is still sane */
-               if (remainder < ROUND_UP(super->len, 512) >> 9)
+               if (remainder < (unsigned)ROUND_UP(super->len, 512) >> 9)
                        remainder = ROUND_UP(super->len, 512) >> 9;
                if (reservation > remainder)
                        reservation = remainder;
@@ -635,13 +685,44 @@ static int is_failed(struct imsm_disk *disk)
        return (disk->status & FAILED_DISK) == FAILED_DISK;
 }
 
+/* Return minimum size of a spare that can be used in this array*/
+static unsigned long long min_acceptable_spare_size_imsm(struct supertype *st)
+{
+       struct intel_super *super = st->sb;
+       struct dl *dl;
+       struct extent *e;
+       int i;
+       unsigned long long rv = 0;
+
+       if (!super)
+               return rv;
+       /* find first active disk in array */
+       dl = super->disks;
+       while (dl && (is_failed(&dl->disk) || dl->index == -1))
+               dl = dl->next;
+       if (!dl)
+               return rv;
+       /* find last lba used by subarrays */
+       e = get_extents(super, dl);
+       if (!e)
+               return rv;
+       for (i = 0; e[i].size; i++)
+               continue;
+       if (i > 0)
+               rv = e[i-1].start + e[i-1].size;
+       free(e);
+       /* add the amount of space needed for metadata */
+       rv = rv + MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS;
+       return rv * 512;
+}
+
 #ifndef MDASSEMBLE
 static __u64 blocks_per_migr_unit(struct imsm_dev *dev);
 
 static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
 {
        __u64 sz;
-       int slot;
+       int slot, i;
        struct imsm_map *map = get_imsm_map(dev, 0);
        __u32 ord;
 
@@ -650,6 +731,12 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
        printf("           UUID : %s\n", uuid);
        printf("     RAID Level : %d\n", get_imsm_raid_level(map));
        printf("        Members : %d\n", map->num_members);
+       printf("          Slots : [");
+       for (i = 0; i < map->num_members; i++) {
+               ord = get_imsm_ord_tbl_ent(dev, i);
+               printf("%s", ord & IMSM_ORD_REBUILD ? "_" : "U");
+       }
+       printf("]\n");
        slot = get_imsm_disk_slot(map, disk_idx);
        if (slot >= 0) {
                ord = get_imsm_ord_tbl_ent(dev, slot);
@@ -697,7 +784,7 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
                printf(" <-- %s", map_state_str[map->map_state]);
                printf("\n     Checkpoint : %u (%llu)",
                       __le32_to_cpu(dev->vol.curr_migr_unit),
-                      blocks_per_migr_unit(dev));
+                      (unsigned long long)blocks_per_migr_unit(dev));
        }
        printf("\n");
        printf("    Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");
@@ -724,7 +811,7 @@ static void print_imsm_disk(struct imsm_super *mpb, int index, __u32 reserved)
               human_size(sz * 512));
 }
 
-static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info);
+static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info, char *map);
 
 static void examine_super_imsm(struct supertype *st, char *homehost)
 {
@@ -736,7 +823,7 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
        char nbuf[64];
        __u32 sum;
        __u32 reserved = imsm_reserved_sectors(super, super->disks);
-
+       struct dl *dl;
 
        snprintf(str, MPB_SIG_LEN, "%s", mpb->sig);
        printf("          Magic : %s\n", str);
@@ -745,7 +832,7 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
        printf("    Orig Family : %08x\n", __le32_to_cpu(mpb->orig_family_num));
        printf("         Family : %08x\n", __le32_to_cpu(mpb->family_num));
        printf("     Generation : %08x\n", __le32_to_cpu(mpb->generation_num));
-       getinfo_super_imsm(st, &info);
+       getinfo_super_imsm(st, &info, NULL);
        fname_from_uuid(st, &info, nbuf, ':');
        printf("           UUID : %s\n", nbuf + 5);
        sum = __le32_to_cpu(mpb->check_sum);
@@ -772,7 +859,7 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
                struct imsm_dev *dev = __get_imsm_dev(mpb, i);
 
                super->current_vol = i;
-               getinfo_super_imsm(st, &info);
+               getinfo_super_imsm(st, &info, NULL);
                fname_from_uuid(st, &info, nbuf, ':');
                print_imsm_dev(dev, nbuf + 5, super->disks->index);
        }
@@ -781,6 +868,26 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
                        continue;
                print_imsm_disk(mpb, i, reserved);
        }
+       for (dl = super->disks ; dl; dl = dl->next) {
+               struct imsm_disk *disk;
+               char str[MAX_RAID_SERIAL_LEN + 1];
+               __u64 sz;
+
+               if (dl->index >= 0)
+                       continue;
+
+               disk = &dl->disk;
+               printf("\n");
+               snprintf(str, MAX_RAID_SERIAL_LEN + 1, "%s", disk->serial);
+               printf("    Disk Serial : %s\n", str);
+               printf("          State :%s%s%s\n", is_spare(disk) ? " spare" : "",
+                      is_configured(disk) ? " active" : "",
+                      is_failed(disk) ? " failed" : "");
+               printf("             Id : %08x\n", __le32_to_cpu(disk->scsi_id));
+               sz = __le32_to_cpu(disk->total_blocks) - reserved;
+               printf("    Usable Size : %llu%s\n", (unsigned long long)sz,
+                      human_size(sz * 512));
+       }
 }
 
 static void brief_examine_super_imsm(struct supertype *st, int verbose)
@@ -795,7 +902,7 @@ static void brief_examine_super_imsm(struct supertype *st, int verbose)
                return;
        }
 
-       getinfo_super_imsm(st, &info);
+       getinfo_super_imsm(st, &info, NULL);
        fname_from_uuid(st, &info, nbuf, ':');
        printf("ARRAY metadata=imsm UUID=%s\n", nbuf + 5);
 }
@@ -812,13 +919,13 @@ static void brief_examine_subarrays_imsm(struct supertype *st, int verbose)
        if (!super->anchor->num_raid_devs)
                return;
 
-       getinfo_super_imsm(st, &info);
+       getinfo_super_imsm(st, &info, NULL);
        fname_from_uuid(st, &info, nbuf, ':');
        for (i = 0; i < super->anchor->num_raid_devs; i++) {
                struct imsm_dev *dev = get_imsm_dev(super, i);
 
                super->current_vol = i;
-               getinfo_super_imsm(st, &info);
+               getinfo_super_imsm(st, &info, NULL);
                fname_from_uuid(st, &info, nbuf1, ':');
                printf("ARRAY /dev/md/%.16s container=%s member=%d UUID=%s\n",
                       dev->volume, nbuf + 5, i, nbuf1 + 5);
@@ -832,7 +939,7 @@ static void export_examine_super_imsm(struct supertype *st)
        struct mdinfo info;
        char nbuf[64];
 
-       getinfo_super_imsm(st, &info);
+       getinfo_super_imsm(st, &info, NULL);
        fname_from_uuid(st, &info, nbuf, ':');
        printf("MD_METADATA=imsm\n");
        printf("MD_LEVEL=container\n");
@@ -845,7 +952,7 @@ static void detail_super_imsm(struct supertype *st, char *homehost)
        struct mdinfo info;
        char nbuf[64];
 
-       getinfo_super_imsm(st, &info);
+       getinfo_super_imsm(st, &info, NULL);
        fname_from_uuid(st, &info, nbuf, ':');
        printf("\n           UUID : %s\n", nbuf + 5);
 }
@@ -854,7 +961,7 @@ static void brief_detail_super_imsm(struct supertype *st)
 {
        struct mdinfo info;
        char nbuf[64];
-       getinfo_super_imsm(st, &info);
+       getinfo_super_imsm(st, &info, NULL);
        fname_from_uuid(st, &info, nbuf, ':');
        printf(" UUID=%s", nbuf + 5);
 }
@@ -874,7 +981,7 @@ static int imsm_enumerate_ports(const char *hba_path, int port_count, int host_b
        int err = 0;
        unsigned long port_mask = (1 << port_count) - 1;
 
-       if (port_count > sizeof(port_mask) * 8) {
+       if (port_count > (int)sizeof(port_mask) * 8) {
                if (verbose)
                        fprintf(stderr, Name ": port_count %d out of range\n", port_count);
                return 2;
@@ -1396,6 +1503,7 @@ static __u64 blocks_per_migr_unit(struct imsm_dev *dev)
                return migr_chunk * stripes_per_unit;
        }
        case MIGR_GEN_MIGR:
+               /* FIXME I need a number here */
        case MIGR_STATE_CHANGE:
        default:
                return 0;
@@ -1417,13 +1525,15 @@ static int imsm_level_to_layout(int level)
        return UnSet;
 }
 
-static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info)
+static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, char *dmap)
 {
        struct intel_super *super = st->sb;
        struct imsm_dev *dev = get_imsm_dev(super, super->current_vol);
        struct imsm_map *map = get_imsm_map(dev, 0);
+       struct imsm_map *prev_map = get_imsm_map(dev, 1);
        struct dl *dl;
        char *devname;
+       int map_disks = info->array.raid_disks;
 
        for (dl = super->disks; dl; dl = dl->next)
                if (dl->raiddisk == info->disk.raid_disk)
@@ -1452,6 +1562,11 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info)
        info->component_size      = __le32_to_cpu(map->blocks_per_member);
        memset(info->uuid, 0, sizeof(info->uuid));
        info->recovery_start = MaxSector;
+       info->reshape_active = (prev_map != NULL);
+       if (info->reshape_active)
+               info->delta_disks = map->num_members - prev_map->num_members;
+       else
+               info->delta_disks = 0;
 
        if (map->map_state == IMSM_T_STATE_UNINITIALIZED || dev->vol.dirty) {
                info->resync_start = 0;
@@ -1494,46 +1609,46 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info)
        free(devname);
        info->safe_mode_delay = 4000;  /* 4 secs like the Matrix driver */
        uuid_from_super_imsm(st, info->uuid);
-}
 
-/* check the config file to see if we can return a real uuid for this spare */
-static void fixup_container_spare_uuid(struct mdinfo *inf)
-{
-       struct mddev_ident_s *array_list;
-
-       if (inf->array.level != LEVEL_CONTAINER ||
-           memcmp(inf->uuid, uuid_match_any, sizeof(int[4])) != 0)
-               return;
-
-       array_list = conf_get_ident(NULL);
-
-       for (; array_list; array_list = array_list->next) {
-               if (array_list->uuid_set) {
-                       struct supertype *_sst; /* spare supertype */
-                       struct supertype *_cst; /* container supertype */
-
-                       _cst = array_list->st;
-                       if (_cst)
-                               _sst = _cst->ss->match_metadata_desc(inf->text_version);
-                       else
-                               _sst = NULL;
-
-                       if (_sst) {
-                               memcpy(inf->uuid, array_list->uuid, sizeof(int[4]));
-                               free(_sst);
-                               break;
+       if (dmap) {
+               int i, j;
+               for (i=0; i<map_disks; i++) {
+                       dmap[i] = 0;
+                       if (i < info->array.raid_disks) {
+                               struct imsm_disk *dsk;
+                               j = get_imsm_disk_idx(dev, i);
+                               dsk = get_imsm_disk(super, j);
+                               if (dsk && (dsk->status & CONFIGURED_DISK))
+                                       dmap[i] = 1;
                        }
                }
        }
 }
 
-static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
+static __u8 imsm_check_degraded(struct intel_super *super, struct imsm_dev *dev, int failed);
+static int imsm_count_failed(struct intel_super *super, struct imsm_dev *dev);
+
+static struct imsm_disk *get_imsm_missing(struct intel_super *super, __u8 index)
+{
+       struct dl *d;
+
+       for (d = super->missing; d; d = d->next)
+               if (d->index == index)
+                       return &d->disk;
+       return NULL;
+}
+
+static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info, char *map)
 {
        struct intel_super *super = st->sb;
        struct imsm_disk *disk;
+       int map_disks = info->array.raid_disks;
+       int max_enough = -1;
+       int i;
+       struct imsm_super *mpb;
 
        if (super->current_vol >= 0) {
-               getinfo_super_imsm_volume(st, info);
+               getinfo_super_imsm_volume(st, info, map);
                return;
        }
 
@@ -1561,6 +1676,49 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
        info->name[0] = 0;
        info->recovery_start = MaxSector;
 
+       /* do we have the all the insync disks that we expect? */
+       mpb = super->anchor;
+
+       for (i = 0; i < mpb->num_raid_devs; i++) {
+               struct imsm_dev *dev = get_imsm_dev(super, i);
+               int failed, enough, j, missing = 0;
+               struct imsm_map *map;
+               __u8 state;
+
+               failed = imsm_count_failed(super, dev);
+               state = imsm_check_degraded(super, dev, failed);
+               map = get_imsm_map(dev, dev->vol.migr_state);
+
+               /* any newly missing disks?
+                * (catches single-degraded vs double-degraded)
+                */
+               for (j = 0; j < map->num_members; j++) {
+                       __u32 ord = get_imsm_ord_tbl_ent(dev, i);
+                       __u32 idx = ord_to_idx(ord);
+
+                       if (!(ord & IMSM_ORD_REBUILD) &&
+                           get_imsm_missing(super, idx)) {
+                               missing = 1;
+                               break;
+                       }
+               }
+
+               if (state == IMSM_T_STATE_FAILED)
+                       enough = -1;
+               else if (state == IMSM_T_STATE_DEGRADED &&
+                        (state != map->map_state || missing))
+                       enough = 0;
+               else /* we're normal, or already degraded */
+                       enough = 1;
+
+               /* in the missing/failed disk case check to see
+                * if at least one array is runnable
+                */
+               max_enough = max(max_enough, enough);
+       }
+       dprintf("%s: enough: %d\n", __func__, max_enough);
+       info->container_enough = max_enough;
+
        if (super->disks) {
                __u32 reserved = imsm_reserved_sectors(super, super->disks);
 
@@ -1581,10 +1739,61 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
         */
        if (info->disk.state & (1 << MD_DISK_SYNC) || super->anchor->num_raid_devs)
                uuid_from_super_imsm(st, info->uuid);
-       else {
-               memcpy(info->uuid, uuid_match_any, sizeof(int[4]));
-               fixup_container_spare_uuid(info);
+       else
+               memcpy(info->uuid, uuid_zero, sizeof(uuid_zero));
+
+       /* I don't know how to compute 'map' on imsm, so use safe default */
+       if (map) {
+               int i;
+               for (i = 0; i < map_disks; i++)
+                       map[i] = 1;
+       }
+
+}
+
+/* allocates memory and fills disk in mdinfo structure
+ * for each disk in array */
+struct mdinfo *getinfo_super_disks_imsm(struct supertype *st)
+{
+       struct mdinfo *mddev = NULL;
+       struct intel_super *super = st->sb;
+       struct imsm_disk *disk;
+       int count = 0;
+       struct dl *dl;
+       if (!super || !super->disks)
+               return NULL;
+       dl = super->disks;
+       mddev = malloc(sizeof(*mddev));
+       if (!mddev) {
+               fprintf(stderr, Name ": Failed to allocate memory.\n");
+               return NULL;
        }
+       memset(mddev, 0, sizeof(*mddev));
+       while (dl) {
+               struct mdinfo *tmp;
+               disk = &dl->disk;
+               tmp = malloc(sizeof(*tmp));
+               if (!tmp) {
+                       fprintf(stderr, Name ": Failed to allocate memory.\n");
+                       if (mddev)
+                               sysfs_free(mddev);
+                       return NULL;
+               }
+               memset(tmp, 0, sizeof(*tmp));
+               if (mddev->devs)
+                       tmp->next = mddev->devs;
+               mddev->devs = tmp;
+               tmp->disk.number = count++;
+               tmp->disk.major = dl->major;
+               tmp->disk.minor = dl->minor;
+               tmp->disk.state = is_configured(disk) ?
+                                 (1 << MD_DISK_ACTIVE) : 0;
+               tmp->disk.state |= is_failed(disk) ? (1 << MD_DISK_FAULTY) : 0;
+               tmp->disk.state |= is_spare(disk) ? 0 : (1 << MD_DISK_SYNC);
+               tmp->disk.raid_disk = -1;
+               dl = dl->next;
+       }
+       return mddev;
 }
 
 static int update_super_imsm(struct supertype *st, struct mdinfo *info,
@@ -1626,8 +1835,7 @@ static int update_super_imsm(struct supertype *st, struct mdinfo *info,
        mpb = super->anchor;
 
        if (strcmp(update, "uuid") == 0 && uuid_set && !info->update_private)
-               fprintf(stderr,
-                       Name ": '--uuid' not supported for imsm metadata\n");
+               rv = -1;
        else if (strcmp(update, "uuid") == 0 && uuid_set && info->update_private) {
                mpb->orig_family_num = *((__u32 *) info->update_private);
                rv = 0;
@@ -1648,9 +1856,7 @@ static int update_super_imsm(struct supertype *st, struct mdinfo *info,
        } else if (strcmp(update, "assemble") == 0)
                rv = 0;
        else
-               fprintf(stderr,
-                       Name ": '--update=%s' not supported for imsm metadata\n",
-                       update);
+               rv = -1;
 
        /* successful update? recompute checksum */
        if (rv == 0)
@@ -2007,7 +2213,8 @@ static void migrate(struct imsm_dev *dev, __u8 to_state, int migr_type)
 
        /* duplicate and then set the target end state in map[0] */
        memcpy(dest, src, sizeof_imsm_map(src));
-       if (migr_type == MIGR_REBUILD) {
+       if ((migr_type == MIGR_REBUILD) ||
+           (migr_type ==  MIGR_GEN_MIGR)) {
                __u32 ord;
                int i;
 
@@ -2024,18 +2231,26 @@ static void end_migration(struct imsm_dev *dev, __u8 map_state)
 {
        struct imsm_map *map = get_imsm_map(dev, 0);
        struct imsm_map *prev = get_imsm_map(dev, dev->vol.migr_state);
-       int i;
+       int i, j;
 
        /* merge any IMSM_ORD_REBUILD bits that were not successfully
         * completed in the last migration.
         *
-        * FIXME add support for online capacity expansion and
-        * raid-level-migration
+        * FIXME add support for raid-level-migration
         */
        for (i = 0; i < prev->num_members; i++)
-               map->disk_ord_tbl[i] |= prev->disk_ord_tbl[i];
+               for (j = 0; j < map->num_members; j++)
+                       /* during online capacity expansion
+                        * disks position can be changed if takeover is used
+                        */
+                       if (ord_to_idx(map->disk_ord_tbl[j]) ==
+                           ord_to_idx(prev->disk_ord_tbl[i])) {
+                               map->disk_ord_tbl[j] |= prev->disk_ord_tbl[i];
+                               break;
+                       }
 
        dev->vol.migr_state = 0;
+       dev->vol.migr_type = 0;
        dev->vol.curr_migr_unit = 0;
        map->map_state = map_state;
 }
@@ -2120,6 +2335,13 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
        __u32 check_sum;
 
        get_dev_size(fd, NULL, &dsize);
+       if (dsize < 1024) {
+               if (devname)
+                       fprintf(stderr,
+                               Name ": %s: device to small for imsm\n",
+                               devname);
+               return 1;
+       }
 
        if (lseek64(fd, dsize - (512 * 2), SEEK_SET) < 0) {
                if (devname)
@@ -2191,7 +2413,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
                return 1;
        }
 
-       if (read(fd, super->buf + 512, super->len - 512) != super->len - 512) {
+       if ((unsigned)read(fd, super->buf + 512, super->len - 512) != super->len - 512) {
                if (devname)
                        fprintf(stderr,
                                Name ": Cannot read extended mpb on %s: %s\n",
@@ -2245,6 +2467,7 @@ static void __free_imsm_disk(struct dl *d)
        free(d);
 
 }
+
 static void free_imsm_disks(struct intel_super *super)
 {
        struct dl *d;
@@ -2677,7 +2900,7 @@ imsm_thunderdome(struct intel_super **super_list, int len)
 }
 
 static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
-                              char *devname, int keep_fd)
+                              char *devname)
 {
        struct mdinfo *sra;
        struct intel_super *super_list = NULL;
@@ -2687,14 +2910,9 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
        int retry;
        int err = 0;
        int i;
-       enum sysfs_read_flags flags;
-
-       flags = GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE;
-       if (mdmon_running(devnum))
-               flags |= SKIP_GONE_DEVS;
 
        /* check if 'fd' an opened container */
-       sra = sysfs_read(fd, 0, flags);
+       sra = sysfs_read(fd, 0, GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE);
        if (!sra)
                return 1;
 
@@ -2718,22 +2936,20 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
 
                err = 2;
                sprintf(nm, "%d:%d", sd->disk.major, sd->disk.minor);
-               dfd = dev_open(nm, keep_fd ? O_RDWR : O_RDONLY);
+               dfd = dev_open(nm, O_RDWR);
                if (dfd < 0)
                        goto error;
 
-               err = load_and_parse_mpb(dfd, s, NULL, keep_fd);
+               err = load_and_parse_mpb(dfd, s, NULL, 1);
 
                /* retry the load if we might have raced against mdmon */
                if (err == 3 && mdmon_running(devnum))
                        for (retry = 0; retry < 3; retry++) {
                                usleep(3000);
-                               err = load_and_parse_mpb(dfd, s, NULL, keep_fd);
+                               err = load_and_parse_mpb(dfd, s, NULL, 1);
                                if (err != 3)
                                        break;
                        }
-               if (!keep_fd)
-                       close(dfd);
                if (err)
                        goto error;
        }
@@ -2750,16 +2966,6 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                err = 2;
                goto error;
        }
-
-       if (st->subarray[0]) {
-               if (atoi(st->subarray) <= super->anchor->num_raid_devs)
-                       super->current_vol = atoi(st->subarray);
-               else {
-                       free_imsm(super);
-                       err = 1;
-                       goto error;
-               }
-       }
        err = 0;
 
  error:
@@ -2781,10 +2987,13 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                st->minor_version = 0;
                st->max_devs = IMSM_MAX_DEVICES;
        }
-       st->loaded_container = 1;
-
        return 0;
 }
+
+static int load_container_imsm(struct supertype *st, int fd, char *devname)
+{
+       return load_super_imsm_all(st, fd, &st->sb, devname);
+}
 #endif
 
 static int load_super_imsm(struct supertype *st, int fd, char *devname)
@@ -2793,10 +3002,14 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
        int rv;
 
 #ifndef MDASSEMBLE
-       if (load_super_imsm_all(st, fd, &st->sb, devname, 1) == 0)
+       if (load_super_imsm_all(st, fd, &st->sb, devname) == 0)
                return 0;
 #endif
 
+       if (test_partition(fd))
+               /* IMSM not allowed on partitions */
+               return 1;
+
        free_super_imsm(st);
 
        super = alloc_super();
@@ -2818,23 +3031,12 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
                return rv;
        }
 
-       if (st->subarray[0]) {
-               if (atoi(st->subarray) <= super->anchor->num_raid_devs)
-                       super->current_vol = atoi(st->subarray);
-               else {
-                       free_imsm(super);
-                       return 1;
-               }
-       }
-
        st->sb = super;
        if (st->ss == NULL) {
                st->ss = &super_imsm;
                st->minor_version = 0;
                st->max_devs = IMSM_MAX_DEVICES;
        }
-       st->loaded_container = 0;
-
        return 0;
 }
 
@@ -2910,6 +3112,30 @@ static void imsm_update_version_info(struct intel_super *super)
        }
 }
 
+static int check_name(struct intel_super *super, char *name, int quiet)
+{
+       struct imsm_super *mpb = super->anchor;
+       char *reason = NULL;
+       int i;
+
+       if (strlen(name) > MAX_RAID_SERIAL_LEN)
+               reason = "must be 16 characters or less";
+
+       for (i = 0; i < mpb->num_raid_devs; i++) {
+               struct imsm_dev *dev = get_imsm_dev(super, i);
+
+               if (strncmp((char *) dev->volume, name, MAX_RAID_SERIAL_LEN) == 0) {
+                       reason = "already exists";
+                       break;
+               }
+       }
+
+       if (reason && !quiet)
+               fprintf(stderr, Name ": imsm volume name %s\n", reason);
+
+       return !reason;
+}
+
 static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
                                  unsigned long long size, char *name,
                                  char *homehost, int *uuid)
@@ -2961,17 +3187,8 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
        if (super->current_vol == 0)
                mpb->num_disks = 0;
 
-       for (i = 0; i < super->current_vol; i++) {
-               dev = get_imsm_dev(super, i);
-               if (strncmp((char *) dev->volume, name,
-                            MAX_RAID_SERIAL_LEN) == 0) {
-                       fprintf(stderr, Name": '%s' is already defined for this container\n",
-                               name);
-                       return 0;
-               }
-       }
-
-       sprintf(st->subarray, "%d", idx);
+       if (!check_name(super, name, 0))
+               return 0;
        dv = malloc(sizeof(*dv));
        if (!dv) {
                fprintf(stderr, Name ": failed to allocate device list entry\n");
@@ -3034,7 +3251,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
        map->num_members = info->raid_disks;
        for (i = 0; i < map->num_members; i++) {
                /* initialized in add_to_super */
-               set_imsm_ord_tbl_ent(map, i, 0);
+               set_imsm_ord_tbl_ent(map, i, IMSM_ORD_REBUILD);
        }
        mpb->num_raid_devs++;
 
@@ -3112,6 +3329,7 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
        struct dl *dl;
        struct imsm_dev *dev;
        struct imsm_map *map;
+       int slot;
 
        dev = get_imsm_dev(super, super->current_vol);
        map = get_imsm_map(dev, 0);
@@ -3146,6 +3364,14 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
                dl->index = super->anchor->num_disks;
                super->anchor->num_disks++;
        }
+       /* Check the device has not already been added */
+       slot = get_imsm_disk_slot(map, dl->index);
+       if (slot >= 0 &&
+           (get_imsm_ord_tbl_ent(dev, slot) & IMSM_ORD_REBUILD) == 0) {
+               fprintf(stderr, Name ": %s has been included in this array twice\n",
+                       devname);
+               return 1;
+       }
        set_imsm_ord_tbl_ent(map, dk->number, dl->index);
        dl->disk.status = CONFIGURED_DISK;
 
@@ -3207,6 +3433,7 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
        dd->devname = devname ? strdup(devname) : NULL;
        dd->fd = fd;
        dd->e = NULL;
+       dd->action = DISK_ADD;
        rv = imsm_read_serial(fd, devname, dd->serial);
        if (rv) {
                fprintf(stderr,
@@ -3226,8 +3453,8 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
                dd->disk.scsi_id = __cpu_to_le32(0);
 
        if (st->update_tail) {
-               dd->next = super->add;
-               super->add = dd;
+               dd->next = super->disk_mgmt_list;
+               super->disk_mgmt_list = dd;
        } else {
                dd->next = super->disks;
                super->disks = dd;
@@ -3236,6 +3463,43 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
        return 0;
 }
 
+
+static int remove_from_super_imsm(struct supertype *st, mdu_disk_info_t *dk)
+{
+       struct intel_super *super = st->sb;
+       struct dl *dd;
+
+       /* remove from super works only in mdmon - for communication
+        * manager - monitor. Check if communication memory buffer
+        * is prepared.
+        */
+       if (!st->update_tail) {
+               fprintf(stderr,
+                       Name ": %s shall be used in mdmon context only"
+                       "(line %d).\n", __func__, __LINE__);
+               return 1;
+       }
+       dd = malloc(sizeof(*dd));
+       if (!dd) {
+               fprintf(stderr,
+                       Name ": malloc failed %s:%d.\n", __func__, __LINE__);
+               return 1;
+       }
+       memset(dd, 0, sizeof(*dd));
+       dd->major = dk->major;
+       dd->minor = dk->minor;
+       dd->index = -1;
+       dd->fd = -1;
+       dd->disk.status = SPARE_DISK;
+       dd->action = DISK_REMOVE;
+
+       dd->next = super->disk_mgmt_list;
+       super->disk_mgmt_list = dd;
+
+
+       return 0;
+}
+
 static int store_imsm_mpb(int fd, struct imsm_super *mpb);
 
 static union {
@@ -3289,8 +3553,9 @@ static int write_super_imsm_spares(struct intel_super *super, int doclose)
        return 0;
 }
 
-static int write_super_imsm(struct intel_super *super, int doclose)
+static int write_super_imsm(struct supertype *st, int doclose)
 {
+       struct intel_super *super = st->sb;
        struct imsm_super *mpb = super->anchor;
        struct dl *d;
        __u32 generation;
@@ -3298,6 +3563,7 @@ static int write_super_imsm(struct intel_super *super, int doclose)
        int spares = 0;
        int i;
        __u32 mpb_size = sizeof(struct imsm_super) - sizeof(struct imsm_disk);
+       int num_disks = 0;
 
        /* 'generation' is incremented everytime the metadata is written */
        generation = __le32_to_cpu(mpb->generation_num);
@@ -3310,21 +3576,28 @@ static int write_super_imsm(struct intel_super *super, int doclose)
        if (mpb->orig_family_num == 0)
                mpb->orig_family_num = mpb->family_num;
 
-       mpb_size += sizeof(struct imsm_disk) * mpb->num_disks;
        for (d = super->disks; d; d = d->next) {
                if (d->index == -1)
                        spares++;
-               else
+               else {
                        mpb->disk[d->index] = d->disk;
+                       num_disks++;
+               }
        }
-       for (d = super->missing; d; d = d->next)
+       for (d = super->missing; d; d = d->next) {
                mpb->disk[d->index] = d->disk;
+               num_disks++;
+       }
+       mpb->num_disks = num_disks;
+       mpb_size += sizeof(struct imsm_disk) * mpb->num_disks;
 
        for (i = 0; i < mpb->num_raid_devs; i++) {
                struct imsm_dev *dev = __get_imsm_dev(mpb, i);
-
-               imsm_copy_dev(dev, get_imsm_dev(super, i));
-               mpb_size += sizeof_imsm_dev(dev, 0);
+               struct imsm_dev *dev2 = get_imsm_dev(super, i);
+               if (dev && dev2) {
+                       imsm_copy_dev(dev, dev2);
+                       mpb_size += sizeof_imsm_dev(dev, 0);
+               }
        }
        mpb_size += __le32_to_cpu(mpb->bbm_log_size);
        mpb->mpb_size = __cpu_to_le32(mpb_size);
@@ -3388,13 +3661,13 @@ static int create_array(struct supertype *st, int dev_idx)
        return 0;
 }
 
-static int _add_disk(struct supertype *st)
+static int mgmt_disk(struct supertype *st)
 {
        struct intel_super *super = st->sb;
        size_t len;
-       struct imsm_update_add_disk *u;
+       struct imsm_update_add_remove_disk *u;
 
-       if (!super->add)
+       if (!super->disk_mgmt_list)
                return 0;
 
        len = sizeof(*u);
@@ -3405,7 +3678,7 @@ static int _add_disk(struct supertype *st)
                return 1;
        }
 
-       u->type = update_add_disk;
+       u->type = update_add_remove_disk;
        append_metadata_update(st, u, len);
 
        return 0;
@@ -3427,10 +3700,10 @@ static int write_init_super_imsm(struct supertype *st)
 
                /* determine if we are creating a volume or adding a disk */
                if (current_vol < 0) {
-                       /* in the add disk case we are running in mdmon
-                        * context, so don't close fd's
+                       /* in the mgmt (add/remove) disk case we are running
+                        * in mdmon context, so don't close fd's
                         */
-                       return _add_disk(st);
+                       return mgmt_disk(st);
                } else
                        rv = create_array(st, current_vol);
 
@@ -3440,8 +3713,12 @@ static int write_init_super_imsm(struct supertype *st)
                }
 
                return rv;
-       } else
-               return write_super_imsm(st->sb, 1);
+       } else {
+               struct dl *d;
+               for (d = super->disks; d; d = d->next)
+                       Kill(d->devname, NULL, 0, 1, 1);
+               return write_super_imsm(st, 1);
+       }
 }
 #endif
 
@@ -3748,8 +4025,8 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
        if ((S_IFMT & stb.st_mode) != S_IFBLK)
                return 0;
        for (dl = super->disks ; dl ; dl = dl->next) {
-               if (dl->major == major(stb.st_rdev) &&
-                   dl->minor == minor(stb.st_rdev))
+               if (dl->major == (int)major(stb.st_rdev) &&
+                   dl->minor == (int)minor(stb.st_rdev))
                        break;
        }
        if (!dl) {
@@ -3972,7 +4249,7 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
                 */
                struct intel_super *super;
 
-               if (load_super_imsm_all(st, cfd, (void **) &super, NULL, 1) == 0) {
+               if (load_super_imsm_all(st, cfd, (void **) &super, NULL) == 0) {
                        st->sb = super;
                        st->container_dev = fd2devnum(cfd);
                        close(cfd);
@@ -3989,53 +4266,217 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
        close(cfd);
        return 0;
 }
-#endif /* MDASSEMBLE */
 
-static int is_rebuilding(struct imsm_dev *dev)
+static void default_geometry_imsm(struct supertype *st, int *level, int *layout, int *chunk)
 {
-       struct imsm_map *migr_map;
-
-       if (!dev->vol.migr_state)
-               return 0;
+       struct intel_super *super = st->sb;
 
-       if (migr_type(dev) != MIGR_REBUILD)
-               return 0;
+       if (level && *level == UnSet)
+               *level = LEVEL_CONTAINER;
 
-       migr_map = get_imsm_map(dev, 1);
+       if (level && layout && *layout == UnSet)
+               *layout = imsm_level_to_layout(*level);
 
-       if (migr_map->map_state == IMSM_T_STATE_DEGRADED)
-               return 1;
-       else
-               return 0;
+       if (chunk && (*chunk == UnSet || *chunk == 0) && 
+           super && super->orom)
+               *chunk = imsm_orom_default_chunk(super->orom);
 }
 
-static void update_recovery_start(struct imsm_dev *dev, struct mdinfo *array)
+static void handle_missing(struct intel_super *super, struct imsm_dev *dev);
+
+static int kill_subarray_imsm(struct supertype *st)
 {
-       struct mdinfo *rebuild = NULL;
-       struct mdinfo *d;
-       __u32 units;
+       /* remove the subarray currently referenced by ->current_vol */
+       __u8 i;
+       struct intel_dev **dp;
+       struct intel_super *super = st->sb;
+       __u8 current_vol = super->current_vol;
+       struct imsm_super *mpb = super->anchor;
 
-       if (!is_rebuilding(dev))
-               return;
+       if (super->current_vol < 0)
+               return 2;
+       super->current_vol = -1; /* invalidate subarray cursor */
 
-       /* Find the rebuild target, but punt on the dual rebuild case */
-       for (d = array->devs; d; d = d->next)
-               if (d->recovery_start == 0) {
-                       if (rebuild)
-                               return;
-                       rebuild = d;
-               }
+       /* block deletions that would change the uuid of active subarrays
+        *
+        * FIXME when immutable ids are available, but note that we'll
+        * also need to fixup the invalidated/active subarray indexes in
+        * mdstat
+        */
+       for (i = 0; i < mpb->num_raid_devs; i++) {
+               char subarray[4];
 
-       units = __le32_to_cpu(dev->vol.curr_migr_unit);
-       rebuild->recovery_start = units * blocks_per_migr_unit(dev);
-}
+               if (i < current_vol)
+                       continue;
+               sprintf(subarray, "%u", i);
+               if (is_subarray_active(subarray, st->devname)) {
+                       fprintf(stderr,
+                               Name ": deleting subarray-%d would change the UUID of active subarray-%d, aborting\n",
+                               current_vol, i);
 
+                       return 2;
+               }
+       }
 
-static struct mdinfo *container_content_imsm(struct supertype *st)
+       if (st->update_tail) {
+               struct imsm_update_kill_array *u = malloc(sizeof(*u));
+
+               if (!u)
+                       return 2;
+               u->type = update_kill_array;
+               u->dev_idx = current_vol;
+               append_metadata_update(st, u, sizeof(*u));
+
+               return 0;
+       }
+
+       for (dp = &super->devlist; *dp;)
+               if ((*dp)->index == current_vol) {
+                       *dp = (*dp)->next;
+               } else {
+                       handle_missing(super, (*dp)->dev);
+                       if ((*dp)->index > current_vol)
+                               (*dp)->index--;
+                       dp = &(*dp)->next;
+               }
+
+       /* no more raid devices, all active components are now spares,
+        * but of course failed are still failed
+        */
+       if (--mpb->num_raid_devs == 0) {
+               struct dl *d;
+
+               for (d = super->disks; d; d = d->next)
+                       if (d->index > -2) {
+                               d->index = -1;
+                               d->disk.status = SPARE_DISK;
+                       }
+       }
+
+       super->updates_pending++;
+
+       return 0;
+}
+
+static int update_subarray_imsm(struct supertype *st, char *subarray,
+                               char *update, struct mddev_ident *ident)
+{
+       /* update the subarray currently referenced by ->current_vol */
+       struct intel_super *super = st->sb;
+       struct imsm_super *mpb = super->anchor;
+
+       if (strcmp(update, "name") == 0) {
+               char *name = ident->name;
+               char *ep;
+               int vol;
+
+               if (is_subarray_active(subarray, st->devname)) {
+                       fprintf(stderr,
+                               Name ": Unable to update name of active subarray\n");
+                       return 2;
+               }
+
+               if (!check_name(super, name, 0))
+                       return 2;
+
+               vol = strtoul(subarray, &ep, 10);
+               if (*ep != '\0' || vol >= super->anchor->num_raid_devs)
+                       return 2;
+
+               if (st->update_tail) {
+                       struct imsm_update_rename_array *u = malloc(sizeof(*u));
+
+                       if (!u)
+                               return 2;
+                       u->type = update_rename_array;
+                       u->dev_idx = vol;
+                       snprintf((char *) u->name, MAX_RAID_SERIAL_LEN, "%s", name);
+                       append_metadata_update(st, u, sizeof(*u));
+               } else {
+                       struct imsm_dev *dev;
+                       int i;
+
+                       dev = get_imsm_dev(super, vol);
+                       snprintf((char *) dev->volume, MAX_RAID_SERIAL_LEN, "%s", name);
+                       for (i = 0; i < mpb->num_raid_devs; i++) {
+                               dev = get_imsm_dev(super, i);
+                               handle_missing(super, dev);
+                       }
+                       super->updates_pending++;
+               }
+       } else
+               return 2;
+
+       return 0;
+}
+#endif /* MDASSEMBLE */
+
+static int is_gen_migration(struct imsm_dev *dev)
+{
+       if (!dev->vol.migr_state)
+               return 0;
+
+       if (migr_type(dev) == MIGR_GEN_MIGR)
+               return 1;
+
+       return 0;
+}
+
+static int is_rebuilding(struct imsm_dev *dev)
+{
+       struct imsm_map *migr_map;
+
+       if (!dev->vol.migr_state)
+               return 0;
+
+       if (migr_type(dev) != MIGR_REBUILD)
+               return 0;
+
+       migr_map = get_imsm_map(dev, 1);
+
+       if (migr_map->map_state == IMSM_T_STATE_DEGRADED)
+               return 1;
+       else
+               return 0;
+}
+
+static void update_recovery_start(struct imsm_dev *dev, struct mdinfo *array)
+{
+       struct mdinfo *rebuild = NULL;
+       struct mdinfo *d;
+       __u32 units;
+
+       if (!is_rebuilding(dev))
+               return;
+
+       /* Find the rebuild target, but punt on the dual rebuild case */
+       for (d = array->devs; d; d = d->next)
+               if (d->recovery_start == 0) {
+                       if (rebuild)
+                               return;
+                       rebuild = d;
+               }
+
+       if (!rebuild) {
+               /* (?) none of the disks are marked with
+                * IMSM_ORD_REBUILD, so assume they are missing and the
+                * disk_ord_tbl was not correctly updated
+                */
+               dprintf("%s: failed to locate out-of-sync disk\n", __func__);
+               return;
+       }
+
+       units = __le32_to_cpu(dev->vol.curr_migr_unit);
+       rebuild->recovery_start = units * blocks_per_migr_unit(dev);
+}
+
+
+static struct mdinfo *container_content_imsm(struct supertype *st, char *subarray)
 {
        /* Given a container loaded by load_super_imsm_all,
         * extract information about all the arrays into
         * an mdinfo tree.
+        * If 'subarray' is given, just extract info about that array.
         *
         * For each imsm_dev create an mdinfo, fill it in,
         *  then look for matching devices in super->disks
@@ -4044,27 +4485,32 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
        struct intel_super *super = st->sb;
        struct imsm_super *mpb = super->anchor;
        struct mdinfo *rest = NULL;
-       int i;
+       unsigned int i;
+       int bbm_errors = 0;
 
-       /* do not assemble arrays that might have bad blocks */
-       if (imsm_bbm_log_size(super->anchor)) {
-               fprintf(stderr, Name ": BBM log found in metadata. "
-                               "Cannot activate array(s).\n");
-               return NULL;
-       }
+       /* check for bad blocks */
+       if (imsm_bbm_log_size(super->anchor))
+               bbm_errors = 1;
 
        for (i = 0; i < mpb->num_raid_devs; i++) {
-               struct imsm_dev *dev = get_imsm_dev(super, i);
-               struct imsm_map *map = get_imsm_map(dev, 0);
+               struct imsm_dev *dev;
+               struct imsm_map *map;
                struct mdinfo *this;
                int slot;
+               char *ep;
+
+               if (subarray &&
+                   (i != strtoul(subarray, &ep, 10) || *ep != '\0'))
+                       continue;
+
+               dev = get_imsm_dev(super, i);
+               map = get_imsm_map(dev, 0);
 
                /* do not publish arrays that are in the middle of an
                 * unsupported migration
                 */
                if (dev->vol.migr_state &&
-                   (migr_type(dev) == MIGR_GEN_MIGR ||
-                    migr_type(dev) == MIGR_STATE_CHANGE)) {
+                   (migr_type(dev) == MIGR_STATE_CHANGE)) {
                        fprintf(stderr, Name ": cannot assemble volume '%.16s':"
                                " unsupported migration in progress\n",
                                dev->volume);
@@ -4081,7 +4527,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
                this->next = rest;
 
                super->current_vol = i;
-               getinfo_super_imsm_volume(st, this);
+               getinfo_super_imsm_volume(st, this, NULL);
                for (slot = 0 ; slot <  map->num_members; slot++) {
                        unsigned long long recovery_start;
                        struct mdinfo *info_d;
@@ -4153,28 +4599,14 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
                rest = this;
        }
 
+       /* if array has bad blocks, set suitable bit in array status */
+       if (bbm_errors)
+               rest->array.state |= (1<<MD_SB_BBM_ERRORS);
+
        return rest;
 }
 
 
-#ifndef MDASSEMBLE
-static int imsm_open_new(struct supertype *c, struct active_array *a,
-                        char *inst)
-{
-       struct intel_super *super = c->sb;
-       struct imsm_super *mpb = super->anchor;
-       
-       if (atoi(inst) >= mpb->num_raid_devs) {
-               fprintf(stderr, "%s: subarry index %d, out of range\n",
-                       __func__, atoi(inst));
-               return -ENODEV;
-       }
-
-       dprintf("imsm: open_new %s\n", inst);
-       a->info.container_member = atoi(inst);
-       return 0;
-}
-
 static __u8 imsm_check_degraded(struct intel_super *super, struct imsm_dev *dev, int failed)
 {
        struct imsm_map *map = get_imsm_map(dev, 0);
@@ -4273,6 +4705,24 @@ static int imsm_count_failed(struct intel_super *super, struct imsm_dev *dev)
        return failed;
 }
 
+#ifndef MDASSEMBLE
+static int imsm_open_new(struct supertype *c, struct active_array *a,
+                        char *inst)
+{
+       struct intel_super *super = c->sb;
+       struct imsm_super *mpb = super->anchor;
+       
+       if (atoi(inst) >= mpb->num_raid_devs) {
+               fprintf(stderr, "%s: subarry index %d, out of range\n",
+                       __func__, atoi(inst));
+               return -ENODEV;
+       }
+
+       dprintf("imsm: open_new %s\n", inst);
+       a->info.container_member = atoi(inst);
+       return 0;
+}
+
 static int is_resyncing(struct imsm_dev *dev)
 {
        struct imsm_map *migr_map;
@@ -4284,9 +4734,13 @@ static int is_resyncing(struct imsm_dev *dev)
            migr_type(dev) == MIGR_REPAIR)
                return 1;
 
+       if (migr_type(dev) == MIGR_GEN_MIGR)
+               return 0;
+
        migr_map = get_imsm_map(dev, 1);
 
-       if (migr_map->map_state == IMSM_T_STATE_NORMAL)
+       if ((migr_map->map_state == IMSM_T_STATE_NORMAL) &&
+           (dev->vol.migr_type != MIGR_GEN_MIGR))
                return 1;
        else
                return 0;
@@ -4313,7 +4767,7 @@ static int mark_failure(struct imsm_dev *dev, struct imsm_disk *disk, int idx)
        disk->status |= FAILED_DISK;
        disk->status &= ~CONFIGURED_DISK;
        set_imsm_ord_tbl_ent(map, slot, idx | IMSM_ORD_REBUILD);
-       if (~map->failed_disk_num == 0)
+       if (map->failed_disk_num == 0xff)
                map->failed_disk_num = slot;
        return 1;
 }
@@ -4329,7 +4783,27 @@ static void mark_missing(struct imsm_dev *dev, struct imsm_disk *disk, int idx)
        memmove(&disk->serial[0], &disk->serial[1], MAX_RAID_SERIAL_LEN - 1);
 }
 
-/* Handle dirty -> clean transititions and resync.  Degraded and rebuild
+static void handle_missing(struct intel_super *super, struct imsm_dev *dev)
+{
+       __u8 map_state;
+       struct dl *dl;
+       int failed;
+
+       if (!super->missing)
+               return;
+       failed = imsm_count_failed(super, dev);
+       map_state = imsm_check_degraded(super, dev, failed);
+
+       dprintf("imsm: mark missing\n");
+       end_migration(dev, map_state);
+       for (dl = super->missing; dl; dl = dl->next)
+               mark_missing(dev, &dl->disk, dl->index);
+       super->updates_pending++;
+}
+
+static void imsm_set_disk(struct active_array *a, int n, int state);
+
+/* Handle dirty -> clean transititions, resync and reshape.  Degraded and rebuild
  * states are handled in imsm_set_disk() with one exception, when a
  * resync is stopped due to a new failure this routine will set the
  * 'degraded' state for the array.
@@ -4344,17 +4818,64 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
        __u8 map_state = imsm_check_degraded(super, dev, failed);
        __u32 blocks_per_unit;
 
-       /* before we activate this array handle any missing disks */
-       if (consistent == 2 && super->missing) {
-               struct dl *dl;
-
-               dprintf("imsm: mark missing\n");
-               end_migration(dev, map_state);
-               for (dl = super->missing; dl; dl = dl->next)
-                       mark_missing(dev, &dl->disk, dl->index);
-               super->updates_pending++;
+       if (dev->vol.migr_state &&
+           dev->vol.migr_type  == MIGR_GEN_MIGR) {
+               /* array state change is blocked due to reshape action
+                * We might need to
+                * - abort the reshape (if last_checkpoint is 0 and action!= reshape)
+                * - finish the reshape (if last_checkpoint is big and action != reshape)
+                * - update curr_migr_unit
+                */
+               if (a->curr_action == reshape) {
+                       /* still reshaping, maybe update curr_migr_unit */
+                       long long blocks_per_unit = blocks_per_migr_unit(dev);
+                       long long unit = a->last_checkpoint;
+                       unit /= blocks_per_unit;
+                       if (unit > __le32_to_cpu(dev->vol.curr_migr_unit)) {
+                               dev->vol.curr_migr_unit = __cpu_to_le32(unit);
+                               super->updates_pending++;
+                       }
+               } else {
+                       if (a->last_checkpoint == 0 && a->prev_action == reshape) {
+                               /* for some reason we aborted the reshape.
+                                * Better clean up
+                                */
+                               struct imsm_map *map2 = get_imsm_map(dev, 1);
+                               dev->vol.migr_state = 0;
+                               dev->vol.migr_type = 0;
+                               dev->vol.curr_migr_unit = 0;
+                               memcpy(map, map2, sizeof_imsm_map(map2));
+                               super->updates_pending++;
+                       }
+                       if (a->last_checkpoint >= a->info.component_size) {
+                               unsigned long long array_blocks;
+                               int used_disks;
+                               /* it seems the reshape is all done */
+                               dev->vol.migr_state = 0;
+                               dev->vol.migr_type = 0;
+                               dev->vol.curr_migr_unit = 0;
+
+                               used_disks = imsm_num_data_members(dev);
+                               array_blocks = map->blocks_per_member * used_disks;
+                               /* round array size down to closest MB */
+                               array_blocks = (array_blocks >> SECT_PER_MB_SHIFT)
+                                       << SECT_PER_MB_SHIFT;
+                               dev->size_low = __cpu_to_le32((__u32) array_blocks);
+                               dev->size_high = __cpu_to_le32((__u32) (array_blocks >> 32));
+                               a->info.custom_array_size = array_blocks;
+                               a->check_reshape = 1; /* encourage manager to update
+                                                      * array size
+                                                      */
+                               super->updates_pending++;
+                       }                               
+               }
+               return 0;
        }
 
+       /* before we activate this array handle any missing disks */
+       if (consistent == 2)
+               handle_missing(super, dev);
+
        if (consistent == 2 &&
            (!is_resync_complete(&a->info) ||
             map_state != IMSM_T_STATE_NORMAL ||
@@ -4370,6 +4891,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                        dprintf("imsm: mark resync done\n");
                        end_migration(dev, map_state);
                        super->updates_pending++;
+                       a->last_checkpoint = 0;
                }
        } else if (!is_resyncing(dev) && !failed) {
                /* mark the start of the init process if nothing is failed */
@@ -4383,14 +4905,11 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
 
        /* check if we can update curr_migr_unit from resync_start, recovery_start */
        blocks_per_unit = blocks_per_migr_unit(dev);
-       if (blocks_per_unit && failed <= 1) {
+       if (blocks_per_unit) {
                __u32 units32;
                __u64 units;
 
-               if (migr_type(dev) == MIGR_REBUILD)
-                       units = min_recovery_start(&a->info) / blocks_per_unit;
-               else
-                       units = a->info.resync_start / blocks_per_unit;
+               units = a->last_checkpoint / blocks_per_unit;
                units32 = units;
 
                /* check that we did not overflow 32-bits, and that
@@ -4413,6 +4932,16 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                        dev->vol.dirty = 1;
                super->updates_pending++;
        }
+
+       /* finalize online capacity expansion/reshape */
+       if ((a->curr_action != reshape) &&
+           (a->prev_action == reshape)) {
+               struct mdinfo *mdi;
+
+               for (mdi = a->info.devs; mdi; mdi = mdi->next)
+                       imsm_set_disk(a, mdi->disk.raid_disk, mdi->curr_state);
+       }
+
        return consistent;
 }
 
@@ -4462,17 +4991,37 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
                map = get_imsm_map(dev, 0);
                map->failed_disk_num = ~0;
                super->updates_pending++;
+               a->last_checkpoint = 0;
        } else if (map_state == IMSM_T_STATE_DEGRADED &&
                   map->map_state != map_state &&
                   !dev->vol.migr_state) {
                dprintf("imsm: mark degraded\n");
                map->map_state = map_state;
                super->updates_pending++;
+               a->last_checkpoint = 0;
        } else if (map_state == IMSM_T_STATE_FAILED &&
                   map->map_state != map_state) {
                dprintf("imsm: mark failed\n");
                end_migration(dev, map_state);
                super->updates_pending++;
+               a->last_checkpoint = 0;
+       } else if (is_gen_migration(dev)) {
+               dprintf("imsm: Detected General Migration in state: ");
+               if (map_state == IMSM_T_STATE_NORMAL) {
+                       end_migration(dev, map_state);
+                       map = get_imsm_map(dev, 0);
+                       map->failed_disk_num = ~0;
+                       dprintf("normal\n");
+               } else {
+                       if (map_state == IMSM_T_STATE_DEGRADED) {
+                               printf("degraded\n");
+                               end_migration(dev, map_state);
+                       } else {
+                               dprintf("failed\n");
+                       }
+                       map->map_state = map_state;
+               }
+               super->updates_pending++;
        }
 }
 
@@ -4493,7 +5042,8 @@ static int store_imsm_mpb(int fd, struct imsm_super *mpb)
                if (lseek64(fd, dsize - (512 * (2 + sectors)), SEEK_SET) < 0)
                        return 1;
 
-               if (write(fd, buf + 512, 512 * sectors) != 512 * sectors)
+               if ((unsigned long long)write(fd, buf + 512, 512 * sectors)
+                   != 512 * sectors)
                        return 1;
        }
 
@@ -4511,10 +5061,11 @@ static void imsm_sync_metadata(struct supertype *container)
 {
        struct intel_super *super = container->sb;
 
+       dprintf("sync metadata: %d\n", super->updates_pending);
        if (!super->updates_pending)
                return;
 
-       write_super_imsm(super, 0);
+       write_super_imsm(container, 0);
 
        super->updates_pending = 0;
 }
@@ -4539,7 +5090,8 @@ static struct dl *imsm_readd(struct intel_super *super, int idx, struct active_a
 }
 
 static struct dl *imsm_add_spare(struct intel_super *super, int slot,
-                                struct active_array *a, int activate_new)
+                                struct active_array *a, int activate_new,
+                                struct mdinfo *additional_test_list)
 {
        struct imsm_dev *dev = get_imsm_dev(super, a->info.container_member);
        int idx = get_imsm_disk_idx(dev, slot);
@@ -4550,9 +5102,10 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot,
        struct extent *ex;
        int i, j;
        int found;
-       __u32 array_start;
-       __u32 array_end;
+       __u32 array_start = 0;
+       __u32 array_end = 0;
        struct dl *dl;
+       struct mdinfo *test_list;
 
        for (dl = super->disks; dl; dl = dl->next) {
                /* If in this array, skip */
@@ -4560,11 +5113,24 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot,
                        if (d->state_fd >= 0 &&
                            d->disk.major == dl->major &&
                            d->disk.minor == dl->minor) {
-                               dprintf("%x:%x already in array\n", dl->major, dl->minor);
+                               dprintf("%x:%x already in array\n",
+                                       dl->major, dl->minor);
                                break;
                        }
                if (d)
                        continue;
+               test_list = additional_test_list;
+               while (test_list) {
+                       if (test_list->disk.major == dl->major &&
+                           test_list->disk.minor == dl->minor) {
+                               dprintf("%x:%x already in additional test list\n",
+                                       dl->major, dl->minor);
+                               break;
+                       }
+                       test_list = test_list->next;
+               }
+               if (test_list)
+                       continue;
 
                /* skip in use or failed drives */
                if (is_failed(&dl->disk) || idx == dl->index ||
@@ -4634,6 +5200,45 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot,
        return dl;
 }
 
+
+static int imsm_rebuild_allowed(struct supertype *cont, int dev_idx, int failed)
+{
+       struct imsm_dev *dev2;
+       struct imsm_map *map;
+       struct dl *idisk;
+       int slot;
+       int idx;
+       __u8 state;
+
+       dev2 = get_imsm_dev(cont->sb, dev_idx);
+       if (dev2) {
+               state = imsm_check_degraded(cont->sb, dev2, failed);
+               if (state == IMSM_T_STATE_FAILED) {
+                       map = get_imsm_map(dev2, 0);
+                       if (!map)
+                               return 1;
+                       for (slot = 0; slot < map->num_members; slot++) {
+                               /*
+                                * Check if failed disks are deleted from intel
+                                * disk list or are marked to be deleted
+                                */
+                               idx = get_imsm_disk_idx(dev2, slot);
+                               idisk = get_imsm_dl_disk(cont->sb, idx);
+                               /*
+                                * Do not rebuild the array if failed disks
+                                * from failed sub-array are not removed from
+                                * container.
+                                */
+                               if (idisk &&
+                                   is_failed(&idisk->disk) &&
+                                   (idisk->action != DISK_REMOVE))
+                                       return 0;
+                       }
+               }
+       }
+       return 1;
+}
+
 static struct mdinfo *imsm_activate_spare(struct active_array *a,
                                          struct metadata_update **updates)
 {
@@ -4661,6 +5266,7 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a,
        struct imsm_update_activate_spare *u;
        int num_spares = 0;
        int i;
+       int allowed;
 
        for (d = a->info.devs ; d ; d = d->next) {
                if ((d->curr_state & DS_FAULTY) &&
@@ -4673,9 +5279,35 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a,
 
        dprintf("imsm: activate spare: inst=%d failed=%d (%d) level=%d\n",
                inst, failed, a->info.array.raid_disks, a->info.array.level);
+
+       if (dev->vol.migr_state &&
+           dev->vol.migr_type == MIGR_GEN_MIGR)
+               /* No repair during migration */
+               return NULL;
+
        if (imsm_check_degraded(super, dev, failed) != IMSM_T_STATE_DEGRADED)
                return NULL;
 
+       /*
+        * If there are any failed disks check state of the other volume.
+        * Block rebuild if the another one is failed until failed disks
+        * are removed from container.
+        */
+       if (failed) {
+               dprintf("found failed disks in %s, check if there another"
+                       "failed sub-array.\n",
+                       dev->volume);
+               /* check if states of the other volumes allow for rebuild */
+               for (i = 0; i <  super->anchor->num_raid_devs; i++) {
+                       if (i != inst) {
+                               allowed = imsm_rebuild_allowed(a->container,
+                                                              i, failed);
+                               if (!allowed)
+                                       return NULL;
+                       }
+               }
+       }
+
        /* For each slot, if it is not working, find a spare */
        for (i = 0; i < a->info.array.raid_disks; i++) {
                for (d = a->info.devs ; d ; d = d->next)
@@ -4694,9 +5326,9 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a,
                 */
                dl = imsm_readd(super, i, a);
                if (!dl)
-                       dl = imsm_add_spare(super, i, a, 0);
+                       dl = imsm_add_spare(super, i, a, 0, NULL);
                if (!dl)
-                       dl = imsm_add_spare(super, i, a, 1);
+                       dl = imsm_add_spare(super, i, a, 1, NULL);
                if (!dl)
                        continue;
  
@@ -4763,6 +5395,7 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a,
        }
                        
        mu->space = NULL;
+       mu->space_list = NULL;
        mu->len = sizeof(struct imsm_update_activate_spare) * num_spares;
        mu->next = *updates;
        u = (struct imsm_update_activate_spare *) mu->buf;
@@ -4802,7 +5435,83 @@ static int disks_overlap(struct intel_super *super, int idx, struct imsm_update_
        return 0;
 }
 
-static void imsm_delete(struct intel_super *super, struct dl **dlp, int index);
+
+static struct dl *get_disk_super(struct intel_super *super, int major, int minor)
+{
+       struct dl *dl = NULL;
+       for (dl = super->disks; dl; dl = dl->next)
+               if ((dl->major == major) &&  (dl->minor == minor))
+                       return dl;
+       return NULL;
+}
+
+static int remove_disk_super(struct intel_super *super, int major, int minor)
+{
+       struct dl *prev = NULL;
+       struct dl *dl;
+
+       prev = NULL;
+       for (dl = super->disks; dl; dl = dl->next) {
+               if ((dl->major == major) && (dl->minor == minor)) {
+                       /* remove */
+                       if (prev)
+                               prev->next = dl->next;
+                       else
+                               super->disks = dl->next;
+                       dl->next = NULL;
+                       __free_imsm_disk(dl);
+                       dprintf("%s: removed %x:%x\n",
+                               __func__, major, minor);
+                       break;
+               }
+               prev = dl;
+       }
+       return 0;
+}
+
+static void imsm_delete(struct intel_super *super, struct dl **dlp, unsigned index);
+
+static int add_remove_disk_update(struct intel_super *super)
+{
+       int check_degraded = 0;
+       struct dl *disk = NULL;
+       /* add/remove some spares to/from the metadata/contrainer */
+       while (super->disk_mgmt_list) {
+               struct dl *disk_cfg;
+
+               disk_cfg = super->disk_mgmt_list;
+               super->disk_mgmt_list = disk_cfg->next;
+               disk_cfg->next = NULL;
+
+               if (disk_cfg->action == DISK_ADD) {
+                       disk_cfg->next = super->disks;
+                       super->disks = disk_cfg;
+                       check_degraded = 1;
+                       dprintf("%s: added %x:%x\n",
+                               __func__, disk_cfg->major,
+                               disk_cfg->minor);
+               } else if (disk_cfg->action == DISK_REMOVE) {
+                       dprintf("Disk remove action processed: %x.%x\n",
+                               disk_cfg->major, disk_cfg->minor);
+                       disk = get_disk_super(super,
+                                             disk_cfg->major,
+                                             disk_cfg->minor);
+                       if (disk) {
+                               /* store action status */
+                               disk->action = DISK_REMOVE;
+                               /* remove spare disks only */
+                               if (disk->index == -1) {
+                                       remove_disk_super(super,
+                                                         disk_cfg->major,
+                                                         disk_cfg->minor);
+                               }
+                       }
+                       /* release allocate disk structure */
+                       __free_imsm_disk(disk_cfg);
+               }
+       }
+       return check_degraded;
+}
 
 static void imsm_process_update(struct supertype *st,
                                struct metadata_update *update)
@@ -4810,10 +5519,18 @@ static void imsm_process_update(struct supertype *st,
        /**
         * crack open the metadata_update envelope to find the update record
         * update can be one of:
-        *      update_activate_spare - a spare device has replaced a failed
+        *    update_reshape_container_disks - all the arrays in the container
+        *      are being reshaped to have more devices.  We need to mark
+        *      the arrays for general migration and convert selected spares
+        *      into active devices.
+        *    update_activate_spare - a spare device has replaced a failed
         *      device in an array, update the disk_ord_tbl.  If this disk is
         *      present in all member arrays then also clear the SPARE_DISK
         *      flag
+        *    update_create_array
+        *    update_kill_array
+        *    update_rename_array
+        *    update_add_remove_disk
         */
        struct intel_super *super = st->sb;
        struct imsm_super *mpb;
@@ -4838,6 +5555,76 @@ static void imsm_process_update(struct supertype *st,
        mpb = super->anchor;
 
        switch (type) {
+       case update_reshape_container_disks: {
+               struct imsm_update_reshape *u = (void *)update->buf;
+               struct dl *new_disk;
+               struct intel_dev *id;
+               int i;
+               int delta_disks = u->new_raid_disks - u->old_raid_disks;
+               void **tofree = NULL;
+
+               dprintf("imsm: imsm_process_update() for update_reshape\n");
+
+               /* enable spares to use in array */
+               for (i = 0; i < delta_disks; i++) {
+
+                       new_disk = get_disk_super(super,
+                                                 major(u->new_disks[i]),
+                                                 minor(u->new_disks[i]));
+                       if (new_disk == NULL || new_disk->index < 0)
+                               goto update_reshape_exit;
+
+                       new_disk->index = mpb->num_disks++;
+                       /* slot to fill in autolayout */
+                       new_disk->raiddisk = new_disk->index;
+                       new_disk->disk.status |=
+                               CONFIGURED_DISK;
+                       new_disk->disk.status &= ~SPARE_DISK;
+               }
+
+               dprintf("imsm: process_update(): update_reshape: volume set"\
+                       " mpb->num_raid_devs = %i\n", mpb->num_raid_devs);
+               /* manage changes in volumes
+                */
+               for (id = super->devlist ; id; id = id->next) {
+                       void **sp = update->space_list;
+                       struct imsm_dev *newdev;
+                       struct imsm_map *newmap, *oldmap;
+
+                       if (!sp)
+                               continue;
+                       update->space_list = *sp;
+                       newdev = (void*)sp;
+                       /* Copy the dev, but not (all of) the map */
+                       memcpy(newdev, id->dev, sizeof(*newdev));
+                       oldmap = get_imsm_map(id->dev, 0);
+                       newmap = get_imsm_map(newdev, 0);
+                       /* Copy the current map */
+                       memcpy(newmap, oldmap, sizeof_imsm_map(oldmap));
+                       newdev->vol.migr_state = 1;
+                       newdev->vol.curr_migr_unit = 0;
+                       newdev->vol.migr_type = MIGR_GEN_MIGR;
+                       newmap->num_members = u->new_raid_disks;
+                       for (i = 0; i < delta_disks; i++) {
+                               set_imsm_ord_tbl_ent(newmap,
+                                                    u->old_raid_disks + i,
+                                                    u->old_raid_disks + i);
+                       }
+                       /* New map is correct, now need to save old map */
+                       oldmap = get_imsm_map(newdev, 1);
+                       memcpy(newmap, oldmap, sizeof_imsm_map(oldmap));
+
+                       sp = (void **)id->dev;
+                       id->dev = newdev;
+                       *sp = tofree;
+                       tofree = sp;
+               }
+
+               update->space_list = tofree;
+               super->updates_pending++;
+update_reshape_exit:
+               break;
+       }
        case update_activate_spare: {
                struct imsm_update_activate_spare *u = (void *) update->buf; 
                struct imsm_dev *dev = get_imsm_dev(super, u->array);
@@ -5049,31 +5836,88 @@ static void imsm_process_update(struct supertype *st,
                }
                break;
        }
-       case update_add_disk:
+       case update_kill_array: {
+               struct imsm_update_kill_array *u = (void *) update->buf;
+               int victim = u->dev_idx;
+               struct active_array *a;
+               struct intel_dev **dp;
+               struct imsm_dev *dev;
 
+               /* sanity check that we are not affecting the uuid of
+                * active arrays, or deleting an active array
+                *
+                * FIXME when immutable ids are available, but note that
+                * we'll also need to fixup the invalidated/active
+                * subarray indexes in mdstat
+                */
+               for (a = st->arrays; a; a = a->next)
+                       if (a->info.container_member >= victim)
+                               break;
+               /* by definition if mdmon is running at least one array
+                * is active in the container, so checking
+                * mpb->num_raid_devs is just extra paranoia
+                */
+               dev = get_imsm_dev(super, victim);
+               if (a || !dev || mpb->num_raid_devs == 1) {
+                       dprintf("failed to delete subarray-%d\n", victim);
+                       break;
+               }
+
+               for (dp = &super->devlist; *dp;)
+                       if ((*dp)->index == (unsigned)super->current_vol) {
+                               *dp = (*dp)->next;
+                       } else {
+                               if ((*dp)->index > (unsigned)victim)
+                                       (*dp)->index--;
+                               dp = &(*dp)->next;
+                       }
+               mpb->num_raid_devs--;
+               super->updates_pending++;
+               break;
+       }
+       case update_rename_array: {
+               struct imsm_update_rename_array *u = (void *) update->buf;
+               char name[MAX_RAID_SERIAL_LEN+1];
+               int target = u->dev_idx;
+               struct active_array *a;
+               struct imsm_dev *dev;
+
+               /* sanity check that we are not affecting the uuid of
+                * an active array
+                */
+               snprintf(name, MAX_RAID_SERIAL_LEN, "%s", (char *) u->name);
+               name[MAX_RAID_SERIAL_LEN] = '\0';
+               for (a = st->arrays; a; a = a->next)
+                       if (a->info.container_member == target)
+                               break;
+               dev = get_imsm_dev(super, u->dev_idx);
+               if (a || !dev || !check_name(super, name, 1)) {
+                       dprintf("failed to rename subarray-%d\n", target);
+                       break;
+               }
+
+               snprintf((char *) dev->volume, MAX_RAID_SERIAL_LEN, "%s", name);
+               super->updates_pending++;
+               break;
+       }
+       case update_add_remove_disk: {
                /* we may be able to repair some arrays if disks are
-                * being added */
-               if (super->add) {
+                * being added, check teh status of add_remove_disk
+                * if discs has been added.
+                */
+               if (add_remove_disk_update(super)) {
                        struct active_array *a;
 
                        super->updates_pending++;
-                       for (a = st->arrays; a; a = a->next)
+                       for (a = st->arrays; a; a = a->next)
                                a->check_degraded = 1;
                }
-               /* add some spares to the metadata */
-               while (super->add) {
-                       struct dl *al;
-
-                       al = super->add;
-                       super->add = al->next;
-                       al->next = super->disks;
-                       super->disks = al;
-                       dprintf("%s: added %x:%x\n",
-                               __func__, al->major, al->minor);
-               }
-
                break;
        }
+       default:
+               fprintf(stderr, "error: unsuported process update type:"
+                       "(type: %d)\n", type);
+       }
 }
 
 static void imsm_prepare_update(struct supertype *st,
@@ -5093,6 +5937,38 @@ static void imsm_prepare_update(struct supertype *st,
        size_t len = 0;
 
        switch (type) {
+       case update_reshape_container_disks: {
+               /* Every raid device in the container is about to
+                * gain some more devices, and we will enter a
+                * reconfiguration.
+                * So each 'imsm_map' will be bigger, and the imsm_vol
+                * will now hold 2 of them.
+                * Thus we need new 'struct imsm_dev' allocations sized
+                * as sizeof_imsm_dev but with more devices in both maps.
+                */
+               struct imsm_update_reshape *u = (void *)update->buf;
+               struct intel_dev *dl;
+               void **space_tail = (void**)&update->space_list;
+
+               dprintf("imsm: imsm_prepare_update() for update_reshape\n");
+
+               for (dl = super->devlist; dl; dl = dl->next) {
+                       int size = sizeof_imsm_dev(dl->dev, 1);
+                       void *s;
+                       size += sizeof(__u32) * 2 * 
+                               (u->new_raid_disks - u->old_raid_disks);
+                       s = malloc(size);
+                       if (!s)
+                               break;
+                       *space_tail = s;
+                       space_tail = s;
+                       *space_tail = NULL;
+               }
+
+               len = disks_to_mpb_size(u->new_raid_disks);
+               dprintf("New anchor length is %llu\n", (unsigned long long)len);
+               break;
+       }
        case update_create_array: {
                struct imsm_update_create_array *u = (void *) update->buf;
                struct intel_dev *dv;
@@ -5160,7 +6036,7 @@ static void imsm_prepare_update(struct supertype *st,
 }
 
 /* must be called while manager is quiesced */
-static void imsm_delete(struct intel_super *super, struct dl **dlp, int index)
+static void imsm_delete(struct intel_super *super, struct dl **dlp, unsigned index)
 {
        struct imsm_super *mpb = super->anchor;
        struct dl *iter;
@@ -5174,10 +6050,10 @@ static void imsm_delete(struct intel_super *super, struct dl **dlp, int index)
 
        /* shift all indexes down one */
        for (iter = super->disks; iter; iter = iter->next)
-               if (iter->index > index)
+               if (iter->index > (int)index)
                        iter->index--;
        for (iter = super->missing; iter; iter = iter->next)
-               if (iter->index > index)
+               if (iter->index > (int)index)
                        iter->index--;
 
        for (i = 0; i < mpb->num_raid_devs; i++) {
@@ -5212,6 +6088,316 @@ static void imsm_delete(struct intel_super *super, struct dl **dlp, int index)
 }
 #endif /* MDASSEMBLE */
 
+static char disk_by_path[] = "/dev/disk/by-path/";
+
+static const char *imsm_get_disk_controller_domain(const char *path)
+{
+       struct sys_dev *list, *hba = NULL;
+       char disk_path[PATH_MAX];
+       int ahci = 0;
+       char *dpath = NULL;
+
+       list = find_driver_devices("pci", "ahci");
+       for (hba = list; hba; hba = hba->next)
+               if (devpath_to_vendor(hba->path) == 0x8086)
+                       break;
+
+       if (hba) {
+               struct stat st;
+
+               strncpy(disk_path, disk_by_path, PATH_MAX - 1);
+               strncat(disk_path, path, PATH_MAX - strlen(disk_path) - 1);
+               if (stat(disk_path, &st) == 0) {
+                       dpath = devt_to_devpath(st.st_rdev);
+                       if (dpath)
+                               ahci = path_attached_to_hba(dpath, hba->path);
+               }
+       }
+       dprintf("path: %s(%s) hba: %s attached: %d\n",
+               path, dpath, (hba) ? hba->path : "NULL", ahci);
+       free_sys_dev(&list);
+       if (ahci)
+               return "ahci";
+       else
+               return NULL;
+}
+
+static int imsm_find_array_minor_by_subdev(int subdev, int container, int *minor)
+{
+       char subdev_name[20];
+       struct mdstat_ent *mdstat;
+
+       sprintf(subdev_name, "%d", subdev);
+       mdstat = mdstat_by_subdev(subdev_name, container);
+       if (!mdstat)
+               return -1;
+
+       *minor = mdstat->devnum;
+       free_mdstat(mdstat);
+       return 0;
+}
+
+static int imsm_reshape_is_allowed_on_container(struct supertype *st,
+                                               struct geo_params *geo,
+                                               int *old_raid_disks)
+{
+       int ret_val = 0;
+       struct mdinfo *info, *member;
+       int devices_that_can_grow = 0;
+
+       dprintf("imsm: imsm_reshape_is_allowed_on_container(ENTER): "
+               "st->devnum = (%i)\n",
+               st->devnum);
+
+       if (geo->size != -1 ||
+           geo->level != UnSet ||
+           geo->layout != UnSet ||
+           geo->chunksize != 0 ||
+           geo->raid_disks == UnSet) {
+               dprintf("imsm: Container operation is allowed for "
+                       "raid disks number change only.\n");
+               return ret_val;
+       }
+
+       info = container_content_imsm(st, NULL);
+       for (member = info; member; member = member->next) {
+               int result;
+               int minor;
+
+               dprintf("imsm: checking device_num: %i\n",
+                       member->container_member);
+
+               if (geo->raid_disks < member->array.raid_disks) {
+                       /* we work on container for Online Capacity Expansion
+                        * only so raid_disks has to grow
+                        */
+                       dprintf("imsm: for container operation raid disks "
+                               "increase is required\n");
+                       break;
+               }
+
+               if ((info->array.level != 0) &&
+                   (info->array.level != 5)) {
+                       /* we cannot use this container with other raid level
+                        */
+                       dprintf("imsm: for container operation wrong"\
+                               " raid level (%i) detected\n",
+                               info->array.level);
+                       break;
+               } else {
+                       /* check for platform support
+                        * for this raid level configuration
+                        */
+                       struct intel_super *super = st->sb;
+                       if (!is_raid_level_supported(super->orom,
+                                                    member->array.level,
+                                                    geo->raid_disks)) {
+                               dprintf("platform does not support raid%d with"\
+                                       " %d disk%s\n",
+                                        info->array.level,
+                                        geo->raid_disks,
+                                        geo->raid_disks > 1 ? "s" : "");
+                               break;
+                       }
+               }
+
+               if (*old_raid_disks &&
+                   info->array.raid_disks != *old_raid_disks)
+                       break;
+               *old_raid_disks = info->array.raid_disks;
+
+               /* All raid5 and raid0 volumes in container
+                * have to be ready for Online Capacity Expansion
+                * so they need to be assembled.  We have already
+                * checked that no recovery etc is happening.
+                */
+               result = imsm_find_array_minor_by_subdev(member->container_member,
+                                                        st->container_dev,
+                                                        &minor);
+               if (result < 0) {
+                       dprintf("imsm: cannot find array\n");
+                       break;
+               }
+               devices_that_can_grow++;
+       }
+       sysfs_free(info);
+       if (!member && devices_that_can_grow)
+               ret_val = 1;
+
+       if (ret_val)
+               dprintf("\tContainer operation allowed\n");
+       else
+               dprintf("\tError: %i\n", ret_val);
+
+       return ret_val;
+}
+
+/* Function: get_spares_for_grow
+ * Description: Allocates memory and creates list of spare devices
+ *             avaliable in container. Checks if spare drive size is acceptable.
+ * Parameters: Pointer to the supertype structure
+ * Returns: Pointer to the list of spare devices (mdinfo structure) on success,
+ *             NULL if fail
+ */
+static struct mdinfo *get_spares_for_grow(struct supertype *st)
+{
+       unsigned long long min_size = min_acceptable_spare_size_imsm(st);
+       return container_choose_spares(st, min_size, NULL, NULL, NULL, 0);
+}
+
+/******************************************************************************
+ * function: imsm_create_metadata_update_for_reshape
+ * Function creates update for whole IMSM container.
+ *
+ ******************************************************************************/
+static int imsm_create_metadata_update_for_reshape(
+       struct supertype *st,
+       struct geo_params *geo,
+       int old_raid_disks,
+       struct imsm_update_reshape **updatep)
+{
+       struct intel_super *super = st->sb;
+       struct imsm_super *mpb = super->anchor;
+       int update_memory_size = 0;
+       struct imsm_update_reshape *u = NULL;
+       struct mdinfo *spares = NULL;
+       int i;
+       int delta_disks = 0;
+
+       dprintf("imsm_update_metadata_for_reshape(enter) raid_disks = %i\n",
+               geo->raid_disks);
+
+       delta_disks = geo->raid_disks - old_raid_disks;
+
+       /* size of all update data without anchor */
+       update_memory_size = sizeof(struct imsm_update_reshape);
+
+       /* now add space for spare disks that we need to add. */
+       update_memory_size += sizeof(u->new_disks[0]) * (delta_disks - 1);
+
+       u = calloc(1, update_memory_size);
+       if (u == NULL) {
+               dprintf("error: "
+                       "cannot get memory for imsm_update_reshape update\n");
+               return 0;
+       }
+       u->type = update_reshape_container_disks;
+       u->old_raid_disks = old_raid_disks;
+       u->new_raid_disks = geo->raid_disks;
+
+       /* now get spare disks list
+        */
+       spares = get_spares_for_grow(st);
+
+       if (spares == NULL
+           || delta_disks > spares->array.spare_disks) {
+               dprintf("imsm: ERROR: Cannot get spare devices.\n");
+               goto abort;
+       }
+
+       /* we have got spares
+        * update disk list in imsm_disk list table in anchor
+        */
+       dprintf("imsm: %i spares are available.\n\n",
+               spares->array.spare_disks);
+
+       for (i = 0; i < delta_disks; i++) {
+               struct mdinfo *dev = spares->devs;
+               struct dl *dl;
+
+               u->new_disks[i] = makedev(dev->disk.major,
+                                         dev->disk.minor);
+               dl = get_disk_super(super, dev->disk.major, dev->disk.minor);
+               dl->index = mpb->num_disks++;
+       }
+       /* Now update the metadata so that container_content will find
+        * the new devices
+        */
+       for (i = 0; i < mpb->num_raid_devs; i++) {
+               int d;
+               struct imsm_dev *dev = get_imsm_dev(super, i);
+               struct imsm_map *map = get_imsm_map(dev, 0);
+               map->num_members = geo->raid_disks;
+               for (d = 0; d < delta_disks; d++) {
+                       set_imsm_ord_tbl_ent(map, old_raid_disks + d,
+                                            mpb->num_disks - delta_disks + d);
+               }
+       }
+
+abort:
+       /* free spares
+        */
+       sysfs_free(spares);
+
+       if (i == delta_disks) {
+               *updatep = u;
+               return update_memory_size;
+       }
+       free(u);
+
+       return 0;
+}
+
+
+static int imsm_reshape_super(struct supertype *st, long long size, int level,
+                             int layout, int chunksize, int raid_disks,
+                             char *backup, char *dev, int verbouse)
+{
+       /* currently we only support increasing the number of devices
+        * for a container.  This increases the number of device for each
+        * member array.  They must all be RAID0 or RAID5.
+        */
+
+       int ret_val = 1;
+       struct geo_params geo;
+
+       dprintf("imsm: reshape_super called.\n");
+
+       memset(&geo, sizeof(struct geo_params), 0);
+
+       geo.dev_name = dev;
+       geo.size = size;
+       geo.level = level;
+       geo.layout = layout;
+       geo.chunksize = chunksize;
+       geo.raid_disks = raid_disks;
+
+       dprintf("\tfor level      : %i\n", geo.level);
+       dprintf("\tfor raid_disks : %i\n", geo.raid_disks);
+
+       if (experimental() == 0)
+               return ret_val;
+
+       /* verify reshape conditions
+        * on container level we can only increase number of devices. */
+       if (st->container_dev == st->devnum) {
+               /* check for delta_disks > 0
+                *and supported raid levels 0 and 5 only in container */
+               int old_raid_disks = 0;
+               if (imsm_reshape_is_allowed_on_container(
+                           st, &geo, &old_raid_disks)) {
+                       struct imsm_update_reshape *u = NULL;
+                       int len;
+
+                       len = imsm_create_metadata_update_for_reshape(
+                               st, &geo, old_raid_disks, &u);
+
+                       if (len) {
+                               ret_val = 0;
+                               append_metadata_update(st, u, len);
+                       } else
+                               dprintf("imsm: Cannot prepare "\
+                                       "update\n");
+               } else
+                       dprintf("imsm: Operation is not allowed "\
+                               "on this container\n");
+       } else
+               dprintf("imsm: not a container operation\n");
+
+       dprintf("imsm: reshape_super Exit code = %i\n", ret_val);
+       return ret_val;
+}
+
 struct superswitch super_imsm = {
 #ifndef        MDASSEMBLE
        .examine_super  = examine_super_imsm,
@@ -5223,14 +6409,20 @@ struct superswitch super_imsm = {
        .write_init_super = write_init_super_imsm,
        .validate_geometry = validate_geometry_imsm,
        .add_to_super   = add_to_super_imsm,
+       .remove_from_super = remove_from_super_imsm,
        .detail_platform = detail_platform_imsm,
+       .kill_subarray = kill_subarray_imsm,
+       .update_subarray = update_subarray_imsm,
+       .load_container = load_container_imsm,
 #endif
        .match_home     = match_home_imsm,
        .uuid_from_super= uuid_from_super_imsm,
        .getinfo_super  = getinfo_super_imsm,
+       .getinfo_super_disks = getinfo_super_disks_imsm,
        .update_super   = update_super_imsm,
 
        .avail_size     = avail_size_imsm,
+       .min_acceptable_spare_size = min_acceptable_spare_size_imsm,
 
        .compare_super  = compare_super_imsm,
 
@@ -5240,7 +6432,9 @@ struct superswitch super_imsm = {
        .free_super     = free_super_imsm,
        .match_metadata_desc = match_metadata_desc_imsm,
        .container_content = container_content_imsm,
-       .default_layout = imsm_level_to_layout,
+       .default_geometry = default_geometry_imsm,
+       .get_disk_controller_domain = imsm_get_disk_controller_domain,
+       .reshape_super  = imsm_reshape_super,
 
        .external       = 1,
        .name = "imsm",
@@ -5248,7 +6442,6 @@ struct superswitch super_imsm = {
 #ifndef MDASSEMBLE
 /* for mdmon */
        .open_new       = imsm_open_new,
-       .load_super     = load_super_imsm,
        .set_array_state= imsm_set_array_state,
        .set_disk       = imsm_set_disk,
        .sync_metadata  = imsm_sync_metadata,