]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-intel.c
imsm: store imsm_disk entries in the super->disks list
[thirdparty/mdadm.git] / super-intel.c
index c8419f001d34041167fbd504f312e4506c90542e..a5bc002dd39a5a72cd13f630e7b35619e22daaa3 100644 (file)
@@ -100,16 +100,43 @@ struct imsm_super {
        __u32 mpb_size;                 /* 0x24 - 0x27 Size of MPB */
        __u32 family_num;               /* 0x28 - 0x2B Checksum from first time this config was written */
        __u32 generation_num;           /* 0x2C - 0x2F Incremented each time this array's MPB is written */
-       __u32 reserved[2];              /* 0x30 - 0x37 */
+       __u32 error_log_size;           /* 0x30 - 0x33 in bytes */
+       __u32 attributes;               /* 0x34 - 0x37 */
        __u8 num_disks;                 /* 0x38 Number of configured disks */
        __u8 num_raid_devs;             /* 0x39 Number of configured volumes */
-       __u8 fill[2];                   /* 0x3A - 0x3B */
-#define IMSM_FILLERS 39
-       __u32 filler[IMSM_FILLERS];     /* 0x3C - 0xD7 RAID_MPB_FILLERS */
+       __u8 error_log_pos;             /* 0x3A  */
+       __u8 fill[1];                   /* 0x3B */
+       __u32 cache_size;               /* 0x3c - 0x40 in mb */
+       __u32 orig_family_num;          /* 0x40 - 0x43 original family num */
+       __u32 pwr_cycle_count;          /* 0x44 - 0x47 simulated power cycle count for array */
+       __u32 bbm_log_size;             /* 0x48 - 0x4B - size of bad Block Mgmt Log in bytes */
+#define IMSM_FILLERS 35
+       __u32 filler[IMSM_FILLERS];     /* 0x4C - 0xD7 RAID_MPB_FILLERS */
        struct imsm_disk disk[1];       /* 0xD8 diskTbl[numDisks] */
        /* here comes imsm_dev[num_raid_devs] */
+       /* here comes BBM logs */
 } __attribute__ ((packed));
 
+#define BBM_LOG_MAX_ENTRIES 254
+
+struct bbm_log_entry {
+       __u64 defective_block_start;
+#define UNREADABLE 0xFFFFFFFF
+       __u32 spare_block_offset;
+       __u16 remapped_marked_count;
+       __u16 disk_ordinal;
+} __attribute__ ((__packed__));
+
+struct bbm_log {
+       __u32 signature; /* 0xABADB10C */
+       __u32 entry_count;
+       __u32 reserved_spare_block_count; /* 0 */
+       __u32 reserved; /* 0xFFFF */
+       __u64 first_spare_lba;
+       struct bbm_log_entry mapped_block_entries[BBM_LOG_MAX_ENTRIES];
+} __attribute__ ((__packed__));
+
+
 #ifndef MDASSEMBLE
 static char *map_state_str[] = { "normal", "uninitialized", "degraded", "failed" };
 #endif
@@ -127,55 +154,74 @@ static unsigned int mpb_sectors(struct imsm_super *mpb)
 /* internal representation of IMSM metadata */
 struct intel_super {
        union {
-               struct imsm_super *mpb;
-               void *buf;
+               void *buf; /* O_DIRECT buffer for reading/writing metadata */
+               struct imsm_super *anchor; /* immovable parameters */
        };
+       size_t len; /* size of the 'buf' allocation */
        int updates_pending; /* count of pending updates for mdmon */
        int creating_imsm; /* flag to indicate container creation */
-       int creating_dev; /* index of raid device undergoing creation */
+       int current_vol; /* index of raid device undergoing creation */
+       #define IMSM_MAX_RAID_DEVS 2
+       struct imsm_dev *dev_tbl[IMSM_MAX_RAID_DEVS];
        struct dl {
                struct dl *next;
                int index;
                __u8 serial[MAX_RAID_SERIAL_LEN];
                int major, minor;
                char *devname;
+               struct imsm_disk disk;
                int fd;
        } *disks;
+    struct bbm_log *bbm_log;
 };
 
 struct extent {
        unsigned long long start, size;
 };
 
-static struct supertype *match_metadata_desc_imsm(char *arg)
+/* definition of messages passed to imsm_process_update */
+enum imsm_update_type {
+       update_activate_spare,
+       update_create_array,
+};
+
+struct imsm_update_activate_spare {
+       enum imsm_update_type type;
+       int disk_idx;
+       int slot;
+       int array;
+       struct imsm_update_activate_spare *next;
+};
+
+struct imsm_update_create_array {
+       enum imsm_update_type type;
+       struct imsm_dev dev;
+       int dev_idx;
+};
+
+static int imsm_env_devname_as_serial(void)
 {
-       struct supertype *st;
+       char *val = getenv("IMSM_DEVNAME_AS_SERIAL");
 
-       if (strcmp(arg, "imsm") != 0 &&
-           strcmp(arg, "default") != 0
-               )
-               return NULL;
+       if (val && atoi(val) == 1)
+               return 1;
 
-       st = malloc(sizeof(*st));
-       st->ss = &super_imsm;
-       st->max_devs = IMSM_MAX_DEVICES;
-       st->minor_version = 0;
-       st->sb = NULL;
-       return st;
+       return 0;
 }
 
-static struct supertype *match_metadata_desc_imsm_volume(char *arg)
+
+static struct supertype *match_metadata_desc_imsm(char *arg)
 {
        struct supertype *st;
 
-       if (strcmp(arg, "imsm/volume") != 0 &&
-           strcmp(arg, "raid") != 0 &&
+       if (strcmp(arg, "imsm") != 0 &&
            strcmp(arg, "default") != 0
                )
                return NULL;
 
        st = malloc(sizeof(*st));
-       st->ss = &super_imsm_volume;
+       memset(st, 0, sizeof(*st));
+       st->ss = &super_imsm;
        st->max_devs = IMSM_MAX_DEVICES;
        st->minor_version = 0;
        st->sb = NULL;
@@ -187,14 +233,32 @@ static __u8 *get_imsm_version(struct imsm_super *mpb)
        return &mpb->sig[MPB_SIG_LEN];
 }
 
-static struct imsm_disk *get_imsm_disk(struct imsm_super *mpb, __u8 index)
+/* retrieve a disk directly from the anchor when the anchor is known to be
+ * up-to-date, currently only at load time
+ */
+static struct imsm_disk *__get_imsm_disk(struct imsm_super *mpb, __u8 index)
 {
-       if (index > mpb->num_disks - 1)
+       if (index >= mpb->num_disks)
                return NULL;
        return &mpb->disk[index];
 }
 
-static __u32 gen_imsm_checksum(struct imsm_super *mpb)
+/* retrieve a disk from the parsed metadata */
+static struct imsm_disk *get_imsm_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 NULL;
+}
+
+/* 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
+ */
+static __u32 __gen_imsm_checksum(struct imsm_super *mpb)
 {
        __u32 end = mpb->mpb_size / sizeof(end);
        __u32 *p = (__u32 *) mpb;
@@ -222,13 +286,13 @@ static size_t sizeof_imsm_dev(struct imsm_dev *dev)
        return size;
 }
 
-static struct imsm_dev *get_imsm_dev(struct imsm_super *mpb, __u8 index)
+static struct imsm_dev *__get_imsm_dev(struct imsm_super *mpb, __u8 index)
 {
        int offset;
        int i;
        void *_mpb = mpb;
 
-       if (index > mpb->num_raid_devs - 1)
+       if (index >= mpb->num_raid_devs)
                return NULL;
 
        /* devices start after all disks */
@@ -243,6 +307,13 @@ static struct imsm_dev *get_imsm_dev(struct imsm_super *mpb, __u8 index)
        return NULL;
 }
 
+static struct imsm_dev *get_imsm_dev(struct intel_super *super, __u8 index)
+{
+       if (index >= super->anchor->num_raid_devs)
+               return NULL;
+       return super->dev_tbl[index];
+}
+
 static __u32 get_imsm_disk_idx(struct imsm_map *map, int slot)
 {
        __u32 *ord_tbl = &map->disk_ord_tbl[slot];
@@ -277,18 +348,12 @@ static int cmp_extent(const void *av, const void *bv)
 static struct extent *get_extents(struct intel_super *super, struct dl *dl)
 {
        /* find a list of used extents on the given physical device */
-       struct imsm_super *mpb = super->mpb;
-       struct imsm_disk *disk;
        struct extent *rv, *e;
        int i, j;
        int memberships = 0;
 
-       disk = get_imsm_disk(mpb, dl->index);
-       if (!disk)
-               return NULL;
-
-       for (i = 0; i < mpb->num_raid_devs; i++) {
-               struct imsm_dev *dev = get_imsm_dev(mpb, i);
+       for (i = 0; i < super->anchor->num_raid_devs; i++) {
+               struct imsm_dev *dev = get_imsm_dev(super, i);
                struct imsm_map *map = dev->vol.map;
 
                for (j = 0; j < map->num_members; j++) {
@@ -303,8 +368,8 @@ static struct extent *get_extents(struct intel_super *super, struct dl *dl)
                return NULL;
        e = rv;
 
-       for (i = 0; i < mpb->num_raid_devs; i++) {
-               struct imsm_dev *dev = get_imsm_dev(mpb, i);
+       for (i = 0; i < super->anchor->num_raid_devs; i++) {
+               struct imsm_dev *dev = get_imsm_dev(super, i);
                struct imsm_map *map = dev->vol.map;
 
                for (j = 0; j < map->num_members; j++) {
@@ -319,7 +384,7 @@ static struct extent *get_extents(struct intel_super *super, struct dl *dl)
        }
        qsort(rv, memberships, sizeof(*rv), cmp_extent);
 
-       e->start = __le32_to_cpu(disk->total_blocks) -
+       e->start = __le32_to_cpu(dl->disk.total_blocks) -
                   (MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS);
        e->size = 0;
        return rv;
@@ -365,11 +430,14 @@ static void print_imsm_dev(struct imsm_dev *dev, int index)
 
 static void print_imsm_disk(struct imsm_super *mpb, int index)
 {
-       struct imsm_disk *disk = get_imsm_disk(mpb, index);
+       struct imsm_disk *disk = __get_imsm_disk(mpb, index);
        char str[MAX_RAID_SERIAL_LEN];
        __u32 s;
        __u64 sz;
 
+       if (index < 0)
+               return;
+
        printf("\n");
        snprintf(str, MAX_RAID_SERIAL_LEN, "%s", disk->serial);
        printf("  Disk%02d Serial : %s\n", index, str);
@@ -388,7 +456,7 @@ static void print_imsm_disk(struct imsm_super *mpb, int index)
 static void examine_super_imsm(struct supertype *st, char *homehost)
 {
        struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
+       struct imsm_super *mpb = super->anchor;
        char str[MAX_SIGNATURE_LENGTH];
        int i;
        __u32 sum;
@@ -401,13 +469,24 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
        printf("     Generation : %08x\n", __le32_to_cpu(mpb->generation_num));
        sum = __le32_to_cpu(mpb->check_sum);
        printf("       Checksum : %08x %s\n", sum,
-               gen_imsm_checksum(mpb) == sum ? "correct" : "incorrect");
+               __gen_imsm_checksum(mpb) == sum ? "correct" : "incorrect");
        printf("    MPB Sectors : %d\n", mpb_sectors(mpb));
        printf("          Disks : %d\n", mpb->num_disks);
        printf("   RAID Devices : %d\n", mpb->num_raid_devs);
        print_imsm_disk(mpb, super->disks->index);
+       if (super->bbm_log) {
+               struct bbm_log *log = super->bbm_log;
+
+               printf("\n");
+               printf("Bad Block Management Log:\n");
+               printf("       Log Size : %d\n", __le32_to_cpu(mpb->bbm_log_size));
+               printf("      Signature : %x\n", __le32_to_cpu(log->signature));
+               printf("    Entry Count : %d\n", __le32_to_cpu(log->entry_count));
+               printf("   Spare Blocks : %d\n",  __le32_to_cpu(log->reserved_spare_block_count));
+               printf("    First Spare : %llx\n", __le64_to_cpu(log->first_spare_lba));
+       }
        for (i = 0; i < mpb->num_raid_devs; i++)
-               print_imsm_dev(get_imsm_dev(mpb, i), super->disks->index);
+               print_imsm_dev(__get_imsm_dev(mpb, i), super->disks->index);
        for (i = 0; i < mpb->num_disks; i++) {
                if (i == super->disks->index)
                        continue;
@@ -418,10 +497,9 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
 static void brief_examine_super_imsm(struct supertype *st)
 {
        struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
 
        printf("ARRAY /dev/imsm family=%08x metadata=external:imsm\n",
-               __le32_to_cpu(mpb->family_num));
+               __le32_to_cpu(super->anchor->family_num));
 }
 
 static void detail_super_imsm(struct supertype *st, char *homehost)
@@ -447,6 +525,7 @@ static void uuid_from_super_imsm(struct supertype *st, int uuid[4])
        printf("%s\n", __FUNCTION__);
 }
 
+#if 0
 static void
 get_imsm_numerical_version(struct imsm_super *mpb, int *m, int *p)
 {
@@ -472,6 +551,7 @@ get_imsm_numerical_version(struct imsm_super *mpb, int *m, int *p)
        *m = strtol(minor, NULL, 0);
        *p = strtol(patch, NULL, 0);
 }
+#endif
 
 static int imsm_level_to_layout(int level)
 {
@@ -481,24 +561,51 @@ static int imsm_level_to_layout(int level)
                return 0;
        case 5:
        case 6:
-               return ALGORITHM_LEFT_SYMMETRIC;
+               return ALGORITHM_LEFT_ASYMMETRIC;
        case 10:
                return 0x102; //FIXME is this correct?
        }
        return -1;
 }
 
+static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info)
+{
+       struct intel_super *super = st->sb;
+       struct imsm_dev *dev = get_imsm_dev(super, super->current_vol);
+       struct imsm_map *map = &dev->vol.map[0];
+
+       info->container_member    = super->current_vol;
+       info->array.raid_disks    = map->num_members;
+       info->array.level         = get_imsm_raid_level(map);
+       info->array.layout        = imsm_level_to_layout(info->array.level);
+       info->array.md_minor      = -1;
+       info->array.ctime         = 0;
+       info->array.utime         = 0;
+       info->array.chunk_size    = __le16_to_cpu(map->blocks_per_strip * 512);
+
+       info->data_offset         = __le32_to_cpu(map->pba_of_lba0);
+       info->component_size      = __le32_to_cpu(map->blocks_per_member);
+
+       info->disk.major = 0;
+       info->disk.minor = 0;
+
+       sprintf(info->text_version, "/%s/%d",
+               devnum2devname(st->container_dev),
+               info->container_member);
+}
+
+
 static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
 {
        struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
        struct imsm_disk *disk;
        __u32 s;
 
-       info->array.major_version = 2000;
-       get_imsm_numerical_version(mpb, &info->array.minor_version,
-                                  &info->array.patch_version);
-       info->array.raid_disks    = mpb->num_disks;
+       if (super->current_vol >= 0) {
+               getinfo_super_imsm_volume(st, info);
+               return;
+       }
+       info->array.raid_disks    = super->anchor->num_disks;
        info->array.level         = LEVEL_CONTAINER;
        info->array.layout        = 0;
        info->array.md_minor      = -1;
@@ -515,9 +622,12 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
        info->disk.state = 0;
 
        if (super->disks) {
+               disk = &super->disks->disk;
                info->disk.number = super->disks->index;
                info->disk.raid_disk = super->disks->index;
-               disk = get_imsm_disk(mpb, super->disks->index);
+               info->data_offset = __le32_to_cpu(disk->total_blocks) -
+                                   (MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS);
+               info->component_size = MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS;
                s = __le32_to_cpu(disk->status);
                info->disk.state  = s & CONFIGURED_DISK ? (1 << MD_DISK_ACTIVE) : 0;
                info->disk.state |= s & FAILED_DISK ? (1 << MD_DISK_FAULTY) : 0;
@@ -525,35 +635,6 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
        }
 }
 
-static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info)
-{
-       struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
-       struct imsm_dev *dev = get_imsm_dev(mpb, info->container_member);
-       struct imsm_map *map = &dev->vol.map[0];
-
-       info->array.major_version = 2000;
-       get_imsm_numerical_version(mpb, &info->array.minor_version,
-                                  &info->array.patch_version);
-       info->array.raid_disks    = map->num_members;
-       info->array.level         = get_imsm_raid_level(map);
-       info->array.layout        = imsm_level_to_layout(info->array.level);
-       info->array.md_minor      = -1;
-       info->array.ctime         = 0;
-       info->array.utime         = 0;
-       info->array.chunk_size    = __le16_to_cpu(map->blocks_per_strip * 512);
-
-       info->data_offset         = __le32_to_cpu(map->pba_of_lba0);
-       info->component_size      = __le32_to_cpu(map->blocks_per_member);
-
-       info->disk.major = 0;
-       info->disk.minor = 0;
-
-       sprintf(info->text_version, "/%s/%d",
-               devnum2devname(st->container_dev),
-               info->container_member);
-}
-
 static int update_super_imsm(struct supertype *st, struct mdinfo *info,
                             char *update, char *devname, int verbose,
                             int uuid_set, char *homehost)
@@ -640,42 +721,64 @@ static int compare_super_imsm(struct supertype *st, struct supertype *tst)
                 return 0;
         }
 
-       if (memcmp(first->mpb->sig, sec->mpb->sig, MAX_SIGNATURE_LENGTH) != 0)
+       if (memcmp(first->anchor->sig, sec->anchor->sig, MAX_SIGNATURE_LENGTH) != 0)
                return 3;
-       if (first->mpb->family_num != sec->mpb->family_num)
+       if (first->anchor->family_num != sec->anchor->family_num)
                return 3;
-       if (first->mpb->mpb_size != sec->mpb->mpb_size)
+       if (first->anchor->mpb_size != sec->anchor->mpb_size)
                return 3;
-       if (first->mpb->check_sum != sec->mpb->check_sum)
+       if (first->anchor->check_sum != sec->anchor->check_sum)
                return 3;
 
        return 0;
 }
 
+static void fd2devname(int fd, char *name)
+{
+       struct stat st;
+       char path[256];
+       char dname[100];
+       char *nm;
+       int rv;
+
+       name[0] = '\0';
+       if (fstat(fd, &st) != 0)
+               return;
+       sprintf(path, "/sys/dev/block/%d:%d",
+               major(st.st_rdev), minor(st.st_rdev));
+
+       rv = readlink(path, dname, sizeof(dname));
+       if (rv <= 0)
+               return;
+       
+       dname[rv] = '\0';
+       nm = strrchr(dname, '/');
+       nm++;
+       snprintf(name, MAX_RAID_SERIAL_LEN, "/dev/%s", nm);
+}
+
+
 extern int scsi_get_serial(int fd, void *buf, size_t buf_len);
 
 static int imsm_read_serial(int fd, char *devname,
                            __u8 serial[MAX_RAID_SERIAL_LEN])
 {
        unsigned char scsi_serial[255];
-       int sg_fd;
        int rv;
        int rsp_len;
        int i, cnt;
 
        memset(scsi_serial, 0, sizeof(scsi_serial));
 
-       sg_fd = sysfs_disk_to_sg(fd);
-       if (sg_fd < 0) {
-               if (devname)
-                       fprintf(stderr,
-                               Name ": Failed to open sg interface for %s: %s\n",
-                               devname, strerror(errno));
-               return 1;
+       if (imsm_env_devname_as_serial()) {
+               char name[MAX_RAID_SERIAL_LEN];
+               
+               fd2devname(fd, name);
+               strcpy((char *) serial, name);
+               return 0;
        }
 
-       rv = scsi_get_serial(sg_fd, scsi_serial, sizeof(scsi_serial));
-       close(sg_fd);
+       rv = scsi_get_serial(fd, scsi_serial, sizeof(scsi_serial));
 
        if (rv != 0) {
                if (devname)
@@ -701,10 +804,8 @@ static int imsm_read_serial(int fd, char *devname,
 static int
 load_imsm_disk(int fd, struct intel_super *super, char *devname, int keep_fd)
 {
-       struct imsm_super *mpb = super->mpb;
        struct dl *dl;
        struct stat stb;
-       struct imsm_disk *disk;
        int rv;
        int i;
 
@@ -732,34 +833,94 @@ load_imsm_disk(int fd, struct intel_super *super, char *devname, int keep_fd)
                return 2;
 
        /* look up this disk's index */
-       for (i = 0; i < mpb->num_disks; i++) {
-               disk = get_imsm_disk(mpb, i);
+       for (i = 0; i < super->anchor->num_disks; i++) {
+               struct imsm_disk *disk_iter;
+
+               disk_iter = __get_imsm_disk(super->anchor, i);
 
-               if (memcmp(disk->serial, dl->serial, MAX_RAID_SERIAL_LEN) == 0)
+               if (memcmp(disk_iter->serial, dl->serial,
+                          MAX_RAID_SERIAL_LEN) == 0) {
+                       dl->disk = *disk_iter;
+                       dl->index = i;
                        break;
+               }
        }
 
-       if (i > mpb->num_disks)
-               return 2;
+       if (i == super->anchor->num_disks) {
+               if (devname)
+                       fprintf(stderr,
+                               Name ": failed to match serial \'%s\' for %s\n",
+                               dl->serial, devname);
+               return 0;
+       }
+
+       return 0;
+}
+
+static void imsm_copy_dev(struct imsm_dev *dest, struct imsm_dev *src)
+{
+       int i;
+
+       *dest = *src;
+
+       for (i = 0; i < src->vol.map[0].num_members; i++)
+               dest->vol.map[0].disk_ord_tbl[i] = src->vol.map[0].disk_ord_tbl[i];
+
+       if (!src->vol.migr_state)
+               return;
 
-       dl->index = i;
+       dest->vol.map[1] = src->vol.map[1];
+       for (i = 0; i < src->vol.map[1].num_members; i++)
+               dest->vol.map[1].disk_ord_tbl[i] = src->vol.map[1].disk_ord_tbl[i];
+}
+
+static int parse_raid_devices(struct intel_super *super)
+{
+       int i;
+       struct imsm_dev *dev_new;
+       size_t len;
+
+       for (i = 0; i < super->anchor->num_raid_devs; i++) {
+               struct imsm_dev *dev_iter = __get_imsm_dev(super->anchor, i);
+
+               len = sizeof_imsm_dev(dev_iter);
+               dev_new = malloc(len);
+               if (!dev_new)
+                       return 1;
+               imsm_copy_dev(dev_new, dev_iter);
+               super->dev_tbl[i] = dev_new;
+       }
 
        return 0;
 }
 
+/* retrieve a pointer to the bbm log which starts after all raid devices */
+struct bbm_log *__get_imsm_bbm_log(struct imsm_super *mpb)
+{
+       void *ptr = NULL;
+
+       if (__le32_to_cpu(mpb->bbm_log_size)) {
+               ptr = mpb;
+               ptr += mpb->mpb_size - __le32_to_cpu(mpb->bbm_log_size);
+       } 
+
+       return ptr;
+}
+
+static void __free_imsm(struct intel_super *super);
+
 /* load_imsm_mpb - read matrix metadata
  * allocates super->mpb to be freed by free_super
  */
 static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
 {
        unsigned long long dsize;
-       size_t len, mpb_size;
        unsigned long long sectors;
        struct stat;
-       struct imsm_super anchor;
+       struct imsm_super *anchor;
        __u32 check_sum;
+       int rc;
 
-       memset(super, 0, sizeof(*super));
        get_dev_size(fd, NULL, &dsize);
 
        if (lseek64(fd, dsize - (512 * 2), SEEK_SET) < 0) {
@@ -770,47 +931,52 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
                return 1;
        }
 
-       len = sizeof(anchor);
-       if (read(fd, &anchor, len) != len) {
+       if (posix_memalign((void**)&anchor, 512, 512) != 0) {
+               if (devname)
+                       fprintf(stderr,
+                               Name ": Failed to allocate imsm anchor buffer"
+                               " on %s\n", devname);
+               return 1;
+       }
+       if (read(fd, anchor, 512) != 512) {
                if (devname)
                        fprintf(stderr,
                                Name ": Cannot read anchor block on %s: %s\n",
                                devname, strerror(errno));
+               free(anchor);
                return 1;
        }
 
-       if (strncmp((char *) anchor.sig, MPB_SIGNATURE, MPB_SIG_LEN) != 0) {
+       if (strncmp((char *) anchor->sig, MPB_SIGNATURE, MPB_SIG_LEN) != 0) {
                if (devname)
                        fprintf(stderr,
                                Name ": no IMSM anchor on %s\n", devname);
+               free(anchor);
                return 2;
        }
 
-       mpb_size = __le32_to_cpu(anchor.mpb_size);
-       super->mpb = malloc(mpb_size < 512 ? 512 : mpb_size);
-       if (!super->mpb) {
+       __free_imsm(super);
+       super->len = __le32_to_cpu(anchor->mpb_size);
+       super->len = ROUND_UP(anchor->mpb_size, 512);
+       if (posix_memalign(&super->buf, 512, super->len) != 0) {
                if (devname)
                        fprintf(stderr,
                                Name ": unable to allocate %zu byte mpb buffer\n",
-                               mpb_size);
+                               super->len);
+               free(anchor);
                return 2;
        }
-       memcpy(super->buf, &anchor, sizeof(anchor));
-
-       /* read the rest of the first block */
-       len = 512 - sizeof(anchor);
-       if (read(fd, super->buf + sizeof(anchor), len) != len) {
-               if (devname)
-                       fprintf(stderr,
-                               Name ": Cannot read anchor remainder on %s: %s\n",
-                               devname, strerror(errno));
-               return 2;
+       memcpy(super->buf, anchor, 512);
+
+       sectors = mpb_sectors(anchor) - 1;
+       free(anchor);
+       if (!sectors) {
+               rc = load_imsm_disk(fd, super, devname, 0);
+               if (rc == 0)
+                       rc = parse_raid_devices(super);
+               return rc;
        }
 
-       sectors = mpb_sectors(&anchor) - 1;
-       if (!sectors)
-               return load_imsm_disk(fd, super, devname, 0);
-
        /* read the extended mpb */
        if (lseek64(fd, dsize - (512 * (2 + sectors)), SEEK_SET) < 0) {
                if (devname)
@@ -820,8 +986,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
                return 1;
        }
 
-       len = mpb_size - 512;
-       if (read(fd, super->buf + 512, len) != len) {
+       if (read(fd, super->buf + 512, super->len - 512) != super->len - 512) {
                if (devname)
                        fprintf(stderr,
                                Name ": Cannot read extended mpb on %s: %s\n",
@@ -829,20 +994,27 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
                return 2;
        }
 
-       check_sum = gen_imsm_checksum(super->mpb);
-       if (check_sum != __le32_to_cpu(super->mpb->check_sum)) {
+       check_sum = __gen_imsm_checksum(super->anchor);
+       if (check_sum != __le32_to_cpu(super->anchor->check_sum)) {
                if (devname)
                        fprintf(stderr,
                                Name ": IMSM checksum %x != %x on %s\n",
-                               check_sum, __le32_to_cpu(super->mpb->check_sum),
+                               check_sum, __le32_to_cpu(super->anchor->check_sum),
                                devname);
                return 2;
        }
 
-       return load_imsm_disk(fd, super, devname, 0);
-}
+       /* FIXME the BBM log is disk specific so we cannot use this global
+        * buffer for all disks.  Ok for now since we only look at the global
+        * bbm_log_size parameter to gate assembly
+        */
+       super->bbm_log = __get_imsm_bbm_log(super->anchor);
 
-struct superswitch super_imsm_container;
+       rc = load_imsm_disk(fd, super, devname, 0);
+       if (rc == 0)
+               rc = parse_raid_devices(super);
+       return rc;
+}
 
 static void free_imsm_disks(struct intel_super *super)
 {
@@ -858,14 +1030,28 @@ static void free_imsm_disks(struct intel_super *super)
        }
 }
 
-static void free_imsm(struct intel_super *super)
+/* free all the pieces hanging off of a super pointer */
+static void __free_imsm(struct intel_super *super)
 {
-       if (super->mpb)
-               free(super->mpb);
+       int i;
+
+       if (super->buf) {
+               free(super->buf);
+               super->buf = NULL;
+       }
        free_imsm_disks(super);
-       free(super);
+       for (i = 0; i < IMSM_MAX_RAID_DEVS; i++)
+               if (super->dev_tbl[i]) {
+                       free(super->dev_tbl[i]);
+                       super->dev_tbl[i] = NULL;
+               }
 }
 
+static void free_imsm(struct intel_super *super)
+{
+       __free_imsm(super);
+       free(super);
+}
 
 static void free_super_imsm(struct supertype *st)
 {
@@ -885,7 +1071,7 @@ static struct intel_super *alloc_super(int creating_imsm)
        if (super) {
                memset(super, 0, sizeof(*super));
                super->creating_imsm = creating_imsm;
-               super->creating_dev = -1;
+               super->current_vol = -1;
        }
 
        return super;
@@ -930,7 +1116,7 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                if (!keep_fd)
                        close(dfd);
                if (rv == 0) {
-                       gen = __le32_to_cpu(super->mpb->generation_num);
+                       gen = __le32_to_cpu(super->anchor->generation_num);
                        if (!best || gen > bestgen) {
                                bestgen = gen;
                                best = sd;
@@ -976,9 +1162,16 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                        close(dfd);
        }
 
+       if (st->subarray[0]) {
+               if (atoi(st->subarray) <= super->anchor->num_raid_devs)
+                       super->current_vol = atoi(st->subarray);
+               else
+                       return 1;
+       }
+
        *sbp = super;
        if (st->ss == NULL) {
-               st->ss = &super_imsm_container;
+               st->ss = &super_imsm;
                st->minor_version = 0;
                st->max_devs = IMSM_MAX_DEVICES;
                st->container_dev = fd2devnum(fd);
@@ -997,6 +1190,8 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
        if (load_super_imsm_all(st, fd, &st->sb, devname, 1) == 0)
                return 0;
 #endif
+       if (st->subarray[0])
+               return 1; /* FIXME */
 
        super = alloc_super(0);
        if (!super) {
@@ -1027,49 +1222,27 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
        return 0;
 }
 
-static int init_zero_imsm(struct supertype *st, mdu_array_info_t *info,
-                         unsigned long long size, char *name,
-                         char *homehost, int *uuid)
+static __u16 info_to_blocks_per_strip(mdu_array_info_t *info)
 {
-       st->sb = NULL;
-       return 0;
+       if (info->level == 1)
+               return 128;
+       return info->chunk_size >> 9;
 }
 
-static int init_super_imsm(struct supertype *st, mdu_array_info_t *info,
-                          unsigned long long size, char *name,
-                          char *homehost, int *uuid)
+static __u32 info_to_num_data_stripes(mdu_array_info_t *info)
 {
-       /* This is primarily called by Create when creating a new array.
-        * We will then get add_to_super called for each component, and then
-        * write_init_super called to write it out to each device.
-        * For IMSM, Create can create on fresh devices or on a pre-existing
-        * array.
-        * To create on a pre-existing array a different method will be called.
-        * This one is just for fresh drives.
-        */
-       struct intel_super *super;
-       struct imsm_super *mpb;
-       size_t mpb_size;
+       __u32 num_stripes;
 
-       super = alloc_super(1);
-       if (!super)
-               return 0;
-       mpb_size = disks_to_mpb_size(info->nr_disks);
-       mpb = malloc(mpb_size);
-       if (!mpb) {
-               free(super);
-               return 0;
-       }
-       memset(mpb, 0, mpb_size); 
+       num_stripes = (info->size * 2) / info_to_blocks_per_strip(info);
+       if (info->level == 1)
+               num_stripes /= 2;
 
-       memcpy(mpb->sig, MPB_SIGNATURE, strlen(MPB_SIGNATURE));
-       memcpy(mpb->sig + strlen(MPB_SIGNATURE), MPB_VERSION_RAID5,
-              strlen(MPB_VERSION_RAID5)); 
-       mpb->mpb_size = mpb_size;
+       return num_stripes;
+}
 
-       super->mpb = mpb;
-       st->sb = super;
-       return 1;
+static __u32 info_to_blocks_per_member(mdu_array_info_t *info)
+{
+       return (info->size * 2) & ~(info_to_blocks_per_strip(info) - 1);
 }
 
 static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
@@ -1080,15 +1253,15 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
         * so st->sb is already set.
         */
        struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
+       struct imsm_super *mpb = super->anchor;
        struct imsm_dev *dev;
        struct imsm_vol *vol;
        struct imsm_map *map;
        int idx = mpb->num_raid_devs;
        int i;
        unsigned long long array_blocks;
-       unsigned long long sz;
        __u32 offset = 0;
+       size_t size_old, size_new;
 
        if (mpb->num_raid_devs >= 2) {
                fprintf(stderr, Name": This imsm-container already has the "
@@ -1096,9 +1269,31 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
                return 0;
        }
 
-       super->creating_dev = idx;
-       mpb->num_raid_devs++;
-       dev = get_imsm_dev(mpb, idx);
+       /* ensure the mpb is large enough for the new data */
+       size_old = __le32_to_cpu(mpb->mpb_size);
+       size_new = disks_to_mpb_size(info->nr_disks);
+       if (size_new > size_old) {
+               void *mpb_new;
+               size_t size_round = ROUND_UP(size_new, 512);
+
+               if (posix_memalign(&mpb_new, 512, size_round) != 0) {
+                       fprintf(stderr, Name": could not allocate new mpb\n");
+                       return 0;
+               }
+               memcpy(mpb_new, mpb, size_old);
+               free(mpb);
+               mpb = mpb_new;
+               super->anchor = mpb_new;
+               mpb->mpb_size = __cpu_to_le32(size_new);
+               memset(mpb_new + size_old, 0, size_round - size_old);
+       }
+       super->current_vol = idx;
+       sprintf(st->subarray, "%d", idx);
+       dev = malloc(sizeof(*dev) + sizeof(__u32) * (info->raid_disks - 1));
+       if (!dev) {
+               fprintf(stderr, Name": could not allocate raid device\n");
+               return 0;
+       }
        strncpy((char *) dev->volume, name, MAX_RAID_SERIAL_LEN);
        array_blocks = calc_array_size(info->level, info->raid_disks,
                                       info->layout, info->chunk_size,
@@ -1112,7 +1307,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
        vol->migr_type = 0;
        vol->dirty = 0;
        for (i = 0; i < idx; i++) {
-               struct imsm_dev *prev = get_imsm_dev(mpb, i);
+               struct imsm_dev *prev = get_imsm_dev(super, i);
                struct imsm_map *pmap = &prev->vol.map[0];
 
                offset += __le32_to_cpu(pmap->blocks_per_member);
@@ -1120,98 +1315,88 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
        }
        map = &vol->map[0];
        map->pba_of_lba0 = __cpu_to_le32(offset);
-       sz = info->size * 2;
-       map->blocks_per_member = __cpu_to_le32(sz);
-       map->blocks_per_strip = __cpu_to_le16(info->chunk_size >> 9);
-       map->num_data_stripes = __cpu_to_le32(sz / (info->chunk_size >> 9));
+       map->blocks_per_member = __cpu_to_le32(info_to_blocks_per_member(info));
+       map->blocks_per_strip = __cpu_to_le16(info_to_blocks_per_strip(info));
+       map->num_data_stripes = __cpu_to_le32(info_to_num_data_stripes(info));
        map->map_state = info->level ? IMSM_T_STATE_UNINITIALIZED :
                                       IMSM_T_STATE_NORMAL;
+
+       if (info->level == 1 && info->raid_disks > 2) {
+               fprintf(stderr, Name": imsm does not support more than 2 disks"
+                               "in a raid1 volume\n");
+               return 0;
+       }
        if (info->level == 10)
                map->raid_level = 1;
        else
                map->raid_level = info->level;
+
        map->num_members = info->raid_disks;
        for (i = 0; i < map->num_members; i++) {
                /* initialized in add_to_super */
                map->disk_ord_tbl[i] = __cpu_to_le32(0);
        }
+       mpb->num_raid_devs++;
+       super->dev_tbl[super->current_vol] = dev;
 
        return 1;
 }
 
-static void add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
-                             int fd, char *devname)
+static int init_super_imsm(struct supertype *st, mdu_array_info_t *info,
+                          unsigned long long size, char *name,
+                          char *homehost, int *uuid)
 {
-       struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
-       struct imsm_disk *disk;
-       struct dl *dd;
-       unsigned long long size;
-       __u32 status, id;
-       int rv;
-       struct stat stb;
+       /* This is primarily called by Create when creating a new array.
+        * We will then get add_to_super called for each component, and then
+        * write_init_super called to write it out to each device.
+        * For IMSM, Create can create on fresh devices or on a pre-existing
+        * array.
+        * To create on a pre-existing array a different method will be called.
+        * This one is just for fresh drives.
+        */
+       struct intel_super *super;
+       struct imsm_super *mpb;
+       size_t mpb_size;
 
-       fstat(fd, &stb);
-       dd = malloc(sizeof(*dd));
-       if (!dd) {
-               fprintf(stderr,
-                       Name ": malloc failed %s:%d.\n", __func__, __LINE__);
-               abort();
-       }
-       memset(dd, 0, sizeof(*dd));
-       dd->major = major(stb.st_rdev);
-       dd->minor = minor(stb.st_rdev);
-       dd->index = dk->number;
-       dd->devname = devname ? strdup(devname) : NULL;
-       dd->next = super->disks;
-       dd->fd = fd;
-       rv = imsm_read_serial(fd, devname, dd->serial);
-       if (rv) {
-               fprintf(stderr,
-                       Name ": failed to retrieve scsi serial "
-                       "using \'%s\' instead\n", devname);
-               strcpy((char *) dd->serial, devname);
+       if (!info) {
+               st->sb = NULL;
+               return 0;
        }
+       if (st->sb)
+               return init_super_imsm_volume(st, info, size, name, homehost,
+                                             uuid);
 
-       if (mpb->num_disks <= dk->number)
-               mpb->num_disks = dk->number + 1;
+       super = alloc_super(1);
+       if (!super)
+               return 0;
+       mpb_size = disks_to_mpb_size(info->nr_disks);
+       if (posix_memalign(&super->buf, 512, mpb_size) != 0) {
+               free(super);
+               return 0;
+       }
+       mpb = super->buf;
+       memset(mpb, 0, mpb_size); 
 
-       disk = get_imsm_disk(mpb, dk->number);
-       get_dev_size(fd, NULL, &size);
-       size /= 512;
-       status = USABLE_DISK | SPARE_DISK;
-       strcpy((char *) disk->serial, (char *) dd->serial);
-       disk->total_blocks = __cpu_to_le32(size);
-       disk->status = __cpu_to_le32(status);
-       if (sysfs_disk_to_scsi_id(fd, &id) == 0)
-               disk->scsi_id = __cpu_to_le32(id);
-       else
-               disk->scsi_id = __cpu_to_le32(0);
+       memcpy(mpb->sig, MPB_SIGNATURE, strlen(MPB_SIGNATURE));
+       memcpy(mpb->sig + strlen(MPB_SIGNATURE), MPB_VERSION_RAID5,
+              strlen(MPB_VERSION_RAID5)); 
+       mpb->mpb_size = mpb_size;
 
-       /* update the family number if we are creating a container */
-       if (super->creating_imsm)
-               mpb->family_num = __cpu_to_le32(gen_imsm_checksum(mpb));
-       
-       super->disks = dd;
+       st->sb = super;
+       return 1;
 }
 
 static void add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
                                     int fd, char *devname)
 {
        struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
        struct dl *dl;
        struct imsm_dev *dev;
        struct imsm_map *map;
        struct imsm_disk *disk;
        __u32 status;
 
-       if (super->creating_dev == -1) {
-               fprintf(stderr, Name ": no active raid device\n");
-               abort();
-       }
-
-       dev = get_imsm_dev(mpb, super->creating_dev);
+       dev = get_imsm_dev(super, super->current_vol);
        map = &dev->vol.map[0];
 
        for (dl = super->disks; dl ; dl = dl->next)
@@ -1223,27 +1408,100 @@ static void add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
 
        map->disk_ord_tbl[dk->number] = __cpu_to_le32(dl->index);
 
-       disk = get_imsm_disk(mpb, dl->index);
+       disk = get_imsm_disk(super, dl->index);
        status = CONFIGURED_DISK | USABLE_DISK;
        disk->status = __cpu_to_le32(status);
 }
 
+static void add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
+                             int fd, char *devname)
+{
+       struct intel_super *super = st->sb;
+       struct imsm_super *mpb = super->anchor;
+       struct imsm_disk *disk;
+       struct dl *dd;
+       unsigned long long size;
+       __u32 status, id;
+       int rv;
+       struct stat stb;
+
+       if (super->current_vol >= 0) {
+               add_to_super_imsm_volume(st, dk, fd, devname);
+               return;
+       }
+
+       fstat(fd, &stb);
+       dd = malloc(sizeof(*dd));
+       if (!dd) {
+               fprintf(stderr,
+                       Name ": malloc failed %s:%d.\n", __func__, __LINE__);
+               abort();
+       }
+       memset(dd, 0, sizeof(*dd));
+       dd->major = major(stb.st_rdev);
+       dd->minor = minor(stb.st_rdev);
+       dd->index = -1;
+       dd->devname = devname ? strdup(devname) : NULL;
+       dd->next = super->disks;
+       dd->fd = fd;
+       rv = imsm_read_serial(fd, devname, dd->serial);
+       if (rv) {
+               fprintf(stderr,
+                       Name ": failed to retrieve scsi serial, aborting\n");
+               free(dd);
+               abort();
+       }
+
+       if (mpb->num_disks <= dk->number)
+               mpb->num_disks = dk->number + 1;
+
+       get_dev_size(fd, NULL, &size);
+       size /= 512;
+       status = USABLE_DISK | SPARE_DISK;
+       strcpy((char *) dd->disk.serial, (char *) dd->serial);
+       dd->disk.total_blocks = __cpu_to_le32(size);
+       dd->disk.status = __cpu_to_le32(status);
+       if (sysfs_disk_to_scsi_id(fd, &id) == 0)
+               dd->disk.scsi_id = __cpu_to_le32(id);
+       else
+               dd->disk.scsi_id = __cpu_to_le32(0);
+
+       /* update the family number if we are creating a container */
+       if (super->creating_imsm) {
+               disk = __get_imsm_disk(mpb, dd->index);
+               *disk = dd->disk;
+               mpb->family_num = __cpu_to_le32(__gen_imsm_checksum(mpb));
+       }
+       
+       super->disks = dd;
+}
+
 static int store_imsm_mpb(int fd, struct intel_super *super);
 
 static int write_super_imsm(struct intel_super *super, int doclose)
 {
-       struct imsm_super *mpb = super->mpb;
+       struct imsm_super *mpb = super->anchor;
        struct dl *d;
        __u32 generation;
        __u32 sum;
+       int i;
 
        /* 'generation' is incremented everytime the metadata is written */
        generation = __le32_to_cpu(mpb->generation_num);
        generation++;
        mpb->generation_num = __cpu_to_le32(generation);
 
+       for (d = super->disks; d; d = d->next)
+               mpb->disk[d->index] = d->disk;
+
+       for (i = 0; i < mpb->num_raid_devs; i++) {
+               struct imsm_dev *dev = __get_imsm_dev(mpb, i);
+
+               imsm_copy_dev(dev, super->dev_tbl[i]);
+       }
+
        /* recalculate checksum */
-       sum = gen_imsm_checksum(mpb);
+       sum = __gen_imsm_checksum(mpb);
        mpb->check_sum = __cpu_to_le32(sum);
 
        for (d = super->disks; d ; d = d->next) {
@@ -1263,13 +1521,49 @@ static int write_super_imsm(struct intel_super *super, int doclose)
 
 static int write_init_super_imsm(struct supertype *st)
 {
-       return write_super_imsm(st->sb, 1);
+       if (st->update_tail) {
+               /* queue the recently created array as a metadata update */
+               size_t len;
+               struct imsm_update_create_array *u;
+               struct intel_super *super = st->sb;
+               struct imsm_dev *dev;
+               struct dl *d;
+
+               if (super->current_vol < 0 ||
+                   !(dev = get_imsm_dev(super, super->current_vol))) {
+                       fprintf(stderr, "%s: could not determine sub-array\n",
+                               __func__);
+                       return 1;
+               }
+
+
+               len = sizeof(*u) - sizeof(*dev) + sizeof_imsm_dev(dev);
+               u = malloc(len);
+               if (!u) {
+                       fprintf(stderr, "%s: failed to allocate update buffer\n",
+                               __func__);
+                       return 1;
+               }
+
+               u->type = update_create_array;
+               u->dev_idx = super->current_vol;
+               imsm_copy_dev(&u->dev, dev);
+               append_metadata_update(st, u, len);
+
+               for (d = super->disks; d ; d = d->next) {
+                       close(d->fd);
+                       d->fd = -1;
+               }
+
+               return 0;
+       } else
+               return write_super_imsm(st->sb, 1);
 }
 
 static int store_zero_imsm(struct supertype *st, int fd)
 {
        unsigned long long dsize;
-       char buf[512];
+       void *buf;
 
        get_dev_size(fd, NULL, &dsize);
 
@@ -1277,143 +1571,20 @@ static int store_zero_imsm(struct supertype *st, int fd)
        if (lseek64(fd, dsize - (512 * 2), SEEK_SET) < 0)
                return 1;
 
-       memset(buf, 0, sizeof(buf));
-       if (write(fd, buf, sizeof(buf)) != sizeof(buf))
+       if (posix_memalign(&buf, 512, 512) != 0)
                return 1;
 
+       memset(buf, 0, 512);
+       if (write(fd, buf, 512) != 512)
+               return 1;
        return 0;
 }
 
-static void getinfo_super_n_imsm_container(struct supertype *st, struct mdinfo *info)
-{
-       /* just need offset and size...
-        * of the metadata
-        */
-       struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
-       struct imsm_disk *disk = get_imsm_disk(mpb, info->disk.number);
-
-       info->data_offset = __le32_to_cpu(disk->total_blocks) -
-                           (MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS);
-       info->component_size = MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS;
-}
-
-static void getinfo_super_n_imsm_volume(struct supertype *st, struct mdinfo *info)
-{
-       /* Find the particular details for info->disk.raid_disk.
-        * This includes data_offset, component_size,
-        */
-       struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
-       struct imsm_dev *dev = get_imsm_dev(mpb, super->creating_dev);
-       struct imsm_map *map = &dev->vol.map[0];
-
-       info->data_offset = __le32_to_cpu(map->pba_of_lba0);
-       info->component_size = __le32_to_cpu(map->blocks_per_member);
-}
-
-static int validate_geometry_imsm(struct supertype *st, int level, int layout,
-                                 int raiddisks, int chunk, unsigned long long size,
-                                 char *dev, unsigned long long *freesize)
-{
-       int fd, cfd;
-       struct mdinfo *sra;
-
-       /* if given unused devices create a container 
-        * if given given devices in a container create a member volume
-        */
-       if (level == LEVEL_CONTAINER) {
-               st->ss = &super_imsm_container;
-               if (dev) {
-                       /* validate the container, dev == NULL */
-                       int rv = st->ss->validate_geometry(st, level, layout,
-                                                          raiddisks, chunk,
-                                                          size,
-                                                          NULL, freesize);
-                       if (rv)
-                               return rv;
-               }
-               return st->ss->validate_geometry(st, level, layout, raiddisks,
-                                                chunk, size, dev, freesize);
-       }
-       
-       if (st->sb) {
-               /* creating in a given container */
-               st->ss = &super_imsm_volume;
-               if (dev) {
-                       int rv = st->ss->validate_geometry(st, level, layout,
-                                                          raiddisks, chunk,
-                                                          size,
-                                                          NULL, freesize);
-                       if (rv)
-                               return rv;
-               }
-               return st->ss->validate_geometry(st, level, layout, raiddisks,
-                                                chunk, size, dev, freesize);
-       }
-
-       /* limit creation to the following levels */
-       if (!dev)
-               switch (level) {
-               case 0:
-               case 1:
-               case 10:
-               case 5:
-                       break;
-               default:
-                       return 1;
-               }
-
-       /* This device needs to be a device in an 'imsm' container */
-       fd = open(dev, O_RDONLY|O_EXCL, 0);
-       if (fd >= 0) {
-               fprintf(stderr,
-                       Name ": Cannot create this array on device %s\n",
-                       dev);
-               close(fd);
-               return 0;
-       }
-       if (errno != EBUSY || (fd = open(dev, O_RDONLY, 0)) < 0) {
-               fprintf(stderr, Name ": Cannot open %s: %s\n",
-                       dev, strerror(errno));
-               return 0;
-       }
-       /* Well, it is in use by someone, maybe an 'imsm' container. */
-       cfd = open_container(fd);
-       if (cfd < 0) {
-               close(fd);
-               fprintf(stderr, Name ": Cannot use %s: It is busy\n",
-                       dev);
-               return 0;
-       }
-       sra = sysfs_read(cfd, 0, GET_VERSION);
-       close(fd);
-       if (sra && sra->array.major_version == -1 &&
-           strcmp(sra->text_version, "imsm") == 0) {
-               /* This is a member of a imsm container.  Load the container
-                * and try to create a volume
-                */
-               struct intel_super *super;
-               st->ss = &super_imsm_volume;
-               if (load_super_imsm_all(st, cfd, (void **) &super, NULL, 1) == 0) {
-                       st->sb = super;
-                       st->container_dev = fd2devnum(cfd);
-                       close(cfd);
-                       return st->ss->validate_geometry(st, level, layout,
-                                                        raiddisks, chunk, size,
-                                                        dev, freesize);
-               }
-               close(cfd);
-       } else /* may belong to another container */
-               return 0;
-
-       return 1;
-}
-
 static int validate_geometry_imsm_container(struct supertype *st, int level,
                                            int layout, int raiddisks, int chunk,
                                            unsigned long long size, char *dev,
-                                           unsigned long long *freesize)
+                                           unsigned long long *freesize,
+                                           int verbose)
 {
        int fd;
        unsigned long long ldsize;
@@ -1425,8 +1596,9 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
 
        fd = open(dev, O_RDONLY|O_EXCL, 0);
        if (fd < 0) {
-               fprintf(stderr, Name ": Cannot open %s: %s\n",
-                       dev, strerror(errno));
+               if (verbose)
+                       fprintf(stderr, Name ": imsm: Cannot open %s: %s\n",
+                               dev, strerror(errno));
                return 0;
        }
        if (!get_dev_size(fd, dev, &ldsize)) {
@@ -1446,7 +1618,8 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
 static int validate_geometry_imsm_volume(struct supertype *st, int level,
                                         int layout, int raiddisks, int chunk,
                                         unsigned long long size, char *dev,
-                                        unsigned long long *freesize)
+                                        unsigned long long *freesize,
+                                        int verbose)
 {
        struct stat stb;
        struct intel_super *super = st->sb;
@@ -1460,8 +1633,9 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
                return 0;
 
        if (level == 1 && raiddisks > 2) {
-               fprintf(stderr, Name ": imsm does not support more than 2 "
-                       "in a raid1 configuration\n");
+               if (verbose)
+                       fprintf(stderr, Name ": imsm does not support more "
+                               "than 2 in a raid1 configuration\n");
                return 0;
        }
 
@@ -1471,15 +1645,18 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
 
        if (!dev) {
                /* General test:  make sure there is space for
-                * 'raiddisks' device extents of size 'size'.
+                * 'raiddisks' device extents of size 'size' at a given
+                * offset
                 */
                unsigned long long minsize = size*2 /* convert to blocks */;
+               unsigned long long start_offset = ~0ULL;
                int dcnt = 0;
                if (minsize == 0)
                        minsize = MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS;
                for (dl = super->disks; dl ; dl = dl->next) {
                        int found = 0;
 
+                       pos = 0;
                        i = 0;
                        e = get_extents(super, dl);
                        if (!e) continue;
@@ -1488,6 +1665,13 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
                                esize = e[i].start - pos;
                                if (esize >= minsize)
                                        found = 1;
+                               if (found && start_offset == ~0ULL) {
+                                       start_offset = pos;
+                                       break;
+                               } else if (found && pos != start_offset) {
+                                       found = 0;
+                                       break;
+                               }
                                pos = e[i].start + e[i].size;
                                i++;
                        } while (e[i-1].size);
@@ -1496,9 +1680,11 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
                        free(e);
                }
                if (dcnt < raiddisks) {
-                       fprintf(stderr, Name ": Not enough devices with space "
-                               "for this array (%d < %d)\n",
-                               dcnt, raiddisks);
+                       if (verbose)
+                               fprintf(stderr, Name ": imsm: Not enough "
+                                       "devices with space for this array "
+                                       "(%d < %d)\n",
+                                       dcnt, raiddisks);
                        return 0;
                }
                return 1;
@@ -1514,8 +1700,9 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
                        break;
        }
        if (!dl) {
-               fprintf(stderr, Name ": %s is not in the same imsm set\n",
-                       dev);
+               if (verbose)
+                       fprintf(stderr, Name ": %s is not in the "
+                               "same imsm set\n", dev);
                return 0;
        }
        e = get_extents(super, dl);
@@ -1534,6 +1721,99 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
        return 1;
 }
 
+int imsm_bbm_log_size(struct imsm_super *mpb)
+{
+       return __le32_to_cpu(mpb->bbm_log_size);
+}
+
+static int validate_geometry_imsm(struct supertype *st, int level, int layout,
+                                 int raiddisks, int chunk, unsigned long long size,
+                                 char *dev, unsigned long long *freesize,
+                                 int verbose)
+{
+       int fd, cfd;
+       struct mdinfo *sra;
+
+       /* if given unused devices create a container 
+        * if given given devices in a container create a member volume
+        */
+       if (level == LEVEL_CONTAINER) {
+               /* Must be a fresh device to add to a container */
+               return validate_geometry_imsm_container(st, level, layout,
+                                                       raiddisks, chunk, size,
+                                                       dev, freesize,
+                                                       verbose);
+       }
+       
+       if (st->sb) {
+               /* creating in a given container */
+               return validate_geometry_imsm_volume(st, level, layout,
+                                                    raiddisks, chunk, size,
+                                                    dev, freesize, verbose);
+       }
+
+       /* limit creation to the following levels */
+       if (!dev)
+               switch (level) {
+               case 0:
+               case 1:
+               case 10:
+               case 5:
+                       break;
+               default:
+                       return 1;
+               }
+
+       /* This device needs to be a device in an 'imsm' container */
+       fd = open(dev, O_RDONLY|O_EXCL, 0);
+       if (fd >= 0) {
+               if (verbose)
+                       fprintf(stderr,
+                               Name ": Cannot create this array on device %s\n",
+                               dev);
+               close(fd);
+               return 0;
+       }
+       if (errno != EBUSY || (fd = open(dev, O_RDONLY, 0)) < 0) {
+               if (verbose)
+                       fprintf(stderr, Name ": Cannot open %s: %s\n",
+                               dev, strerror(errno));
+               return 0;
+       }
+       /* Well, it is in use by someone, maybe an 'imsm' container. */
+       cfd = open_container(fd);
+       if (cfd < 0) {
+               close(fd);
+               if (verbose)
+                       fprintf(stderr, Name ": Cannot use %s: It is busy\n",
+                               dev);
+               return 0;
+       }
+       sra = sysfs_read(cfd, 0, GET_VERSION);
+       close(fd);
+       if (sra && sra->array.major_version == -1 &&
+           strcmp(sra->text_version, "imsm") == 0) {
+               /* This is a member of a imsm container.  Load the container
+                * and try to create a volume
+                */
+               struct intel_super *super;
+
+               if (load_super_imsm_all(st, cfd, (void **) &super, NULL, 1) == 0) {
+                       st->sb = super;
+                       st->container_dev = fd2devnum(cfd);
+                       close(cfd);
+                       return validate_geometry_imsm_volume(st, level, layout,
+                                                            raiddisks, chunk,
+                                                            size, dev,
+                                                            freesize, verbose);
+               }
+               close(cfd);
+       } else /* may belong to another container */
+               return 0;
+
+       return 1;
+}
+
 static struct mdinfo *container_content_imsm(struct supertype *st)
 {
        /* Given a container loaded by load_super_imsm_all,
@@ -1545,16 +1825,22 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
         *  and create appropriate device mdinfo.
         */
        struct intel_super *super = st->sb;
-       struct imsm_super *mpb = super->mpb;
+       struct imsm_super *mpb = super->anchor;
        struct mdinfo *rest = NULL;
        int i;
 
+       /* 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;
+       }
+
        for (i = 0; i < mpb->num_raid_devs; i++) {
-               struct imsm_dev *dev = get_imsm_dev(mpb, i);
+               struct imsm_dev *dev = get_imsm_dev(super, i);
                struct imsm_vol *vol = &dev->vol;
                struct imsm_map *map = vol->map;
                struct mdinfo *this;
-               __u64 sz;
                int slot;
 
                this = malloc(sizeof(*this));
@@ -1562,9 +1848,6 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
                this->next = rest;
                rest = this;
 
-               this->array.major_version = 2000;
-               get_imsm_numerical_version(mpb, &this->array.minor_version,
-                                          &this->array.patch_version);
                this->array.level = get_imsm_raid_level(map);
                this->array.raid_disks = map->num_members;
                this->array.layout = imsm_level_to_layout(this->array.level);
@@ -1588,14 +1871,9 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
 
                memset(this->uuid, 0, sizeof(this->uuid));
 
-               sz = __le32_to_cpu(dev->size_high);
-               sz <<= 32;
-               sz += __le32_to_cpu(dev->size_low);
-               this->component_size = sz;
-               this->array.size = this->component_size / 2;
+               this->component_size = __le32_to_cpu(map->blocks_per_member);
 
                for (slot = 0 ; slot <  map->num_members; slot++) {
-                       struct imsm_disk *disk;
                        struct mdinfo *info_d;
                        struct dl *d;
                        int idx;
@@ -1616,8 +1894,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
                        info_d->next = this->devs;
                        this->devs = info_d;
 
-                       disk = get_imsm_disk(mpb, idx);
-                       s = __le32_to_cpu(disk->status);
+                       s = __le32_to_cpu(d->disk.status);
 
                        info_d->disk.number = d->index;
                        info_d->disk.major = d->major;
@@ -1644,30 +1921,23 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
 static int imsm_open_new(struct supertype *c, struct active_array *a,
                         char *inst)
 {
-       fprintf(stderr, "imsm: open_new %s\n", 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 void imsm_set_array_state(struct active_array *a, int consistent)
-{
-       int inst = a->info.container_member;
-       struct intel_super *super = a->container->sb;
-       struct imsm_dev *dev = get_imsm_dev(super->mpb, inst);
-       int dirty = !consistent || (a->resync_start != ~0ULL);
-
-       if (dev->vol.dirty != dirty) {
-               fprintf(stderr, "imsm: mark '%s' (%llu)\n",
-                       dirty?"dirty":"clean", a->resync_start);
-
-               dev->vol.dirty = dirty;
-               super->updates_pending++;
-       }
-}
-
-static __u8 imsm_check_degraded(struct imsm_super *mpb, int n, int failed)
+static __u8 imsm_check_degraded(struct intel_super *super, int n, int failed)
 {
-       struct imsm_dev *dev = get_imsm_dev(mpb, n);
+       struct imsm_dev *dev = get_imsm_dev(super, n);
        struct imsm_map *map = dev->vol.map;
 
        if (!failed)
@@ -1697,7 +1967,7 @@ static __u8 imsm_check_degraded(struct imsm_super *mpb, int n, int failed)
 
                for (i = 0; i < map->num_members; i++) {
                        int idx = get_imsm_disk_idx(map, i);
-                       struct imsm_disk *disk = get_imsm_disk(mpb, idx);
+                       struct imsm_disk *disk = get_imsm_disk(super, idx);
 
                        if (__le32_to_cpu(disk->status) & FAILED_DISK)
                                failed++;
@@ -1725,7 +1995,7 @@ static __u8 imsm_check_degraded(struct imsm_super *mpb, int n, int failed)
        return map->map_state;
 }
 
-static int imsm_count_failed(struct imsm_super *mpb, struct imsm_map *map)
+static int imsm_count_failed(struct intel_super *super, struct imsm_map *map)
 {
        int i;
        int failed = 0;
@@ -1734,7 +2004,7 @@ static int imsm_count_failed(struct imsm_super *mpb, struct imsm_map *map)
        for (i = 0; i < map->num_members; i++) {
                int idx = get_imsm_disk_idx(map, i);
 
-               disk = get_imsm_disk(mpb, idx);
+               disk = get_imsm_disk(super, idx);
                if (__le32_to_cpu(disk->status) & FAILED_DISK)
                        failed++;
        }
@@ -1742,11 +2012,51 @@ static int imsm_count_failed(struct imsm_super *mpb, struct imsm_map *map)
        return failed;
 }
 
+static void imsm_set_array_state(struct active_array *a, int consistent)
+{
+       int inst = a->info.container_member;
+       struct intel_super *super = a->container->sb;
+       struct imsm_dev *dev = get_imsm_dev(super, inst);
+       struct imsm_map *map = &dev->vol.map[0];
+       int dirty = !consistent;
+       int failed;
+       __u8 map_state;
+
+       if (a->resync_start == ~0ULL) {
+               failed = imsm_count_failed(super, map);
+               map_state = imsm_check_degraded(super, inst, failed);
+               /* complete recovery or initial resync */
+               if (!failed)
+                       map_state = IMSM_T_STATE_NORMAL;
+               if (map->map_state != map_state) {
+                       dprintf("imsm: map_state %d: %d\n",
+                               inst, map_state);
+                       map->map_state = map_state;
+                       super->updates_pending++;
+               }
+
+               /* complete resync */
+               if (!dirty && dev->vol.dirty) {
+                       dprintf("imsm: mark 'clean'\n");
+                       dev->vol.dirty = 0;
+                       super->updates_pending++;
+
+               }
+       }
+
+       /* mark dirty */
+       if (dirty && !dev->vol.dirty) {
+               dprintf("imsm: mark 'dirty' (%llu)\n", a->resync_start);
+               dev->vol.dirty = 1;
+               super->updates_pending++;
+       }
+}
+
 static void imsm_set_disk(struct active_array *a, int n, int state)
 {
        int inst = a->info.container_member;
        struct intel_super *super = a->container->sb;
-       struct imsm_dev *dev = get_imsm_dev(super->mpb, inst);
+       struct imsm_dev *dev = get_imsm_dev(super, inst);
        struct imsm_map *map = dev->vol.map;
        struct imsm_disk *disk;
        __u32 status;
@@ -1760,63 +2070,71 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
        if (n < 0)
                return;
 
-       fprintf(stderr, "imsm: set_disk %d:%x\n", n, state);
+       dprintf("imsm: set_disk %d:%x\n", n, state);
 
-       disk = get_imsm_disk(super->mpb, get_imsm_disk_idx(map, n));
+       disk = get_imsm_disk(super, get_imsm_disk_idx(map, n));
 
-       /* check if we have seen this failure before */
+       /* check for new failures */
        status = __le32_to_cpu(disk->status);
        if ((state & DS_FAULTY) && !(status & FAILED_DISK)) {
                status |= FAILED_DISK;
                disk->status = __cpu_to_le32(status);
                new_failure = 1;
+               super->updates_pending++;
        }
 
-       /**
-        * the number of failures have changed, count up 'failed' to determine
+       /* the number of failures have changed, count up 'failed' to determine
         * degraded / failed status
         */
        if (new_failure && map->map_state != IMSM_T_STATE_FAILED)
-               failed = imsm_count_failed(super->mpb, map);
+               failed = imsm_count_failed(super, map);
 
+       /* determine map_state based on failed or in_sync count */
        if (failed)
-               map->map_state = imsm_check_degraded(super->mpb, inst, failed);
-
-       if (new_failure)
-               super->updates_pending++;
+               map->map_state = imsm_check_degraded(super, inst, failed);
+       else if (map->map_state == IMSM_T_STATE_DEGRADED) {
+               struct mdinfo *d;
+               int working = 0;
+
+               for (d = a->info.devs ; d ; d = d->next)
+                       if (d->curr_state & DS_INSYNC)
+                               working++;
+
+               if (working == a->info.array.raid_disks) {
+                       map->map_state = IMSM_T_STATE_NORMAL;
+                       super->updates_pending++;
+               }
+       }
 }
 
 static int store_imsm_mpb(int fd, struct intel_super *super)
 {
-       struct imsm_super *mpb = super->mpb;
+       struct imsm_super *mpb = super->anchor;
        __u32 mpb_size = __le32_to_cpu(mpb->mpb_size);
        unsigned long long dsize;
        unsigned long long sectors;
 
        get_dev_size(fd, NULL, &dsize);
 
-       /* first block is stored on second to last sector of the disk */
-       if (lseek64(fd, dsize - (512 * 2), SEEK_SET) < 0)
-               return 1;
-
-       if (write(fd, super->buf, 512) != 512)
-               return 1;
+       if (mpb_size > 512) {
+               /* -1 to account for anchor */
+               sectors = mpb_sectors(mpb) - 1;
 
-       if (mpb_size <= 512)
-               return 0;
+               /* write the extended mpb to the sectors preceeding the anchor */
+               if (lseek64(fd, dsize - (512 * (2 + sectors)), SEEK_SET) < 0)
+                       return 1;
 
-       /* -1 because we already wrote a sector */
-       sectors = mpb_sectors(mpb) - 1;
+               if (write(fd, super->buf + 512, 512 * sectors) != 512 * sectors)
+                       return 1;
+       }
 
-       /* write the extended mpb to the sectors preceeding the anchor */
-       if (lseek64(fd, dsize - (512 * (2 + sectors)), SEEK_SET) < 0)
+       /* first block is stored on second to last sector of the disk */
+       if (lseek64(fd, dsize - (512 * 2), SEEK_SET) < 0)
                return 1;
 
-       if (write(fd, super->buf + 512, mpb_size - 512) != mpb_size - 512)
+       if (write(fd, super->buf, 512) != 512)
                return 1;
 
-       fsync(fd);
-
        return 0;
 }
 
@@ -1832,12 +2150,422 @@ static void imsm_sync_metadata(struct supertype *container)
        super->updates_pending = 0;
 }
 
+static struct mdinfo *imsm_activate_spare(struct active_array *a,
+                                         struct metadata_update **updates)
+{
+       /**
+        * Take a device that is marked spare in the metadata and use it to
+        * replace a failed/vacant slot in an array.  There may be a case where
+        * a device is failed in one array but active in a second.
+        * imsm_process_update catches this case and does not clear the SPARE_DISK
+        * flag, allowing the second array to start using the device on failure.
+        * SPARE_DISK is cleared when all arrays are using a device.
+        *
+        * FIXME: is this a valid use of SPARE_DISK?
+        */
+
+       struct intel_super *super = a->container->sb;
+       int inst = a->info.container_member;
+       struct imsm_dev *dev = get_imsm_dev(super, inst);
+       struct imsm_map *map = dev->vol.map;
+       int failed = a->info.array.raid_disks;
+       struct mdinfo *rv = NULL;
+       struct mdinfo *d;
+       struct mdinfo *di;
+       struct metadata_update *mu;
+       struct dl *dl;
+       struct imsm_update_activate_spare *u;
+       int num_spares = 0;
+       int i;
+
+       for (d = a->info.devs ; d ; d = d->next) {
+               if ((d->curr_state & DS_FAULTY) &&
+                       d->state_fd >= 0)
+                       /* wait for Removal to happen */
+                       return NULL;
+               if (d->state_fd >= 0)
+                       failed--;
+       }
+
+       dprintf("imsm: activate spare: inst=%d failed=%d (%d) level=%d\n",
+               inst, failed, a->info.array.raid_disks, a->info.array.level);
+       if (imsm_check_degraded(super, inst, failed) != IMSM_T_STATE_DEGRADED)
+               return NULL;
+
+       /* For each slot, if it is not working, find a spare */
+       dl = super->disks;
+       for (i = 0; i < a->info.array.raid_disks; i++) {
+               for (d = a->info.devs ; d ; d = d->next)
+                       if (d->disk.raid_disk == i)
+                               break;
+               dprintf("found %d: %p %x\n", i, d, d?d->curr_state:0);
+               if (d && (d->state_fd >= 0))
+                       continue;
+
+               /* OK, this device needs recovery.  Find a spare */
+               for ( ; dl ; dl = dl->next) {
+                       unsigned long long esize;
+                       unsigned long long pos;
+                       struct mdinfo *d2;
+                       struct extent *ex;
+                       struct imsm_disk *disk;
+                       int j;
+                       int found;
+                       __u32 array_start;
+
+                       /* If in this array, skip */
+                       for (d2 = a->info.devs ; d2 ; d2 = d2->next)
+                               if (d2->disk.major == dl->major &&
+                                   d2->disk.minor == dl->minor) {
+                                       dprintf("%x:%x already in array\n", dl->major, dl->minor);
+                                       break;
+                               }
+                       if (d2)
+                               continue;
+
+                       /* is this unused device marked as a spare? */
+                       disk = get_imsm_disk(super, dl->index);
+                       if (!(__le32_to_cpu(disk->status) & SPARE_DISK))
+                               continue;
+
+                       /* We are allowed to use this device - is there space?
+                        * We need a->info.component_size sectors */
+                       ex = get_extents(super, dl);
+                       if (!ex) {
+                               dprintf("cannot get extents\n");
+                               continue;
+                       }
+                       found = 0;
+                       j = 0;
+                       pos = 0;
+                       array_start = __le32_to_cpu(map->pba_of_lba0);
+
+                       do {
+                               /* check that we can start at pba_of_lba0 with
+                                * a->info.component_size of space
+                                */
+                               esize = ex[j].start - pos;
+                               if (array_start >= pos &&
+                                   array_start + a->info.component_size < ex[j].start) {
+                                       found = 1;
+                                       break;
+                               }
+                               pos = ex[j].start + ex[j].size;
+                               j++;
+                                   
+                       } while (ex[j-1].size);
+
+                       free(ex);
+                       if (!found) {
+                               dprintf("%x:%x does not have %llu at %d\n",
+                                       dl->major, dl->minor,
+                                       a->info.component_size,
+                                       __le32_to_cpu(map->pba_of_lba0));
+                               /* No room */
+                               continue;
+                       }
+
+                       /* found a usable disk with enough space */
+                       di = malloc(sizeof(*di));
+                       memset(di, 0, sizeof(*di));
+                       di->disk.number = dl->index;
+                       di->disk.raid_disk = i;
+                       di->disk.major = dl->major;
+                       di->disk.minor = dl->minor;
+                       di->disk.state = 0;
+                       di->data_offset = array_start;
+                       di->component_size = a->info.component_size;
+                       di->container_member = inst;
+                       di->next = rv;
+                       rv = di;
+                       num_spares++;
+                       dprintf("%x:%x to be %d at %llu\n", dl->major, dl->minor,
+                               i, pos);
+
+                       break;
+               }
+       }
+
+       if (!rv)
+               /* No spares found */
+               return rv;
+       /* Now 'rv' has a list of devices to return.
+        * Create a metadata_update record to update the
+        * disk_ord_tbl for the array
+        */
+       mu = malloc(sizeof(*mu));
+       mu->buf = malloc(sizeof(struct imsm_update_activate_spare) * num_spares);
+       mu->space = NULL;
+       mu->len = sizeof(struct imsm_update_activate_spare) * num_spares;
+       mu->next = *updates;
+       u = (struct imsm_update_activate_spare *) mu->buf;
+
+       for (di = rv ; di ; di = di->next) {
+               u->type = update_activate_spare;
+               u->disk_idx = di->disk.number; 
+               u->slot = di->disk.raid_disk;
+               u->array = inst;
+               u->next = u + 1;
+               u++;
+       }
+       (u-1)->next = NULL;
+       *updates = mu;
+
+       return rv;
+}
+
+static int weight(unsigned int field)
+{
+       int weight;
+
+       for (weight = 0; field; weight++)
+               field &= field - 1;
+
+       return weight;
+}
+
+static int disks_overlap(struct imsm_map *m1, struct imsm_map *m2)
+{
+       int i;
+       int j;
+       int idx;
+
+       for (i = 0; i < m1->num_members; i++) {
+               idx = get_imsm_disk_idx(m1, i);
+               for (j = 0; j < m2->num_members; j++)
+                       if (idx == get_imsm_disk_idx(m2, j))
+                               return 1;
+       }
+
+       return 0;
+}
+
+static void imsm_process_update(struct supertype *st,
+                               struct metadata_update *update)
+{
+       /**
+        * 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
+        *      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
+        */
+       struct intel_super *super = st->sb;
+       struct imsm_super *mpb = super->anchor;
+       enum imsm_update_type type = *(enum imsm_update_type *) update->buf;
+
+       switch (type) {
+       case update_activate_spare: {
+               struct imsm_update_activate_spare *u = (void *) update->buf; 
+               struct imsm_dev *dev = get_imsm_dev(super, u->array);
+               struct imsm_map *map = &dev->vol.map[0];
+               struct active_array *a;
+               struct imsm_disk *disk;
+               __u32 status;
+               struct dl *dl;
+               struct mdinfo *d;
+               unsigned int members;
+               unsigned int found;
+               int victim;
+               int i;
+
+               for (dl = super->disks; dl; dl = dl->next)
+                       if (dl->index == u->disk_idx)
+                               break;
+
+               if (!dl) {
+                       fprintf(stderr, "error: imsm_activate_spare passed "
+                               "an unknown disk_idx: %d\n", u->disk_idx);
+                       return;
+               }
+
+               super->updates_pending++;
+
+               victim = get_imsm_disk_idx(map, u->slot);
+               map->disk_ord_tbl[u->slot] = __cpu_to_le32(u->disk_idx);
+               disk = get_imsm_disk(super, u->disk_idx);
+               status = __le32_to_cpu(disk->status);
+               status |= CONFIGURED_DISK;
+               disk->status = __cpu_to_le32(status);
+
+               /* map unique/live arrays using the spare */
+               members = 0;
+               found = 0;
+               for (a = st->arrays; a; a = a->next) {
+                       int inst = a->info.container_member;
+
+                       dev = get_imsm_dev(super, inst);
+                       map = &dev->vol.map[0];
+                       if (map->raid_level > 0)
+                               members |= 1 << inst;
+                       for (d = a->info.devs; d; d = d->next)
+                               if (d->disk.major == dl->major &&
+                                   d->disk.minor == dl->minor)
+                                       found |= 1 << inst;
+               }
+
+               /* until all arrays that can absorb this disk have absorbed
+                * this disk it can still be considered a spare
+                */
+               if (weight(found) >= weight(members)) {
+                       status = __le32_to_cpu(disk->status);
+                       status &= ~SPARE_DISK;
+                       disk->status = __cpu_to_le32(status);
+               }
+
+               /* count arrays using the victim in the metadata */
+               found = 0;
+               for (a = st->arrays; a ; a = a->next) {
+                       dev = get_imsm_dev(super, a->info.container_member);
+                       map = &dev->vol.map[0];
+                       for (i = 0; i < map->num_members; i++)
+                               if (victim == get_imsm_disk_idx(map, i))
+                                       found++;
+               }
+
+               /* clear some flags if the victim is no longer being
+                * utilized anywhere
+                */
+               disk = get_imsm_disk(super, victim);
+               if (!found) {
+                       status = __le32_to_cpu(disk->status);
+                       status &= ~(CONFIGURED_DISK | USABLE_DISK);
+                       disk->status = __cpu_to_le32(status);
+               }
+               break;
+       }
+       case update_create_array: {
+               /* someone wants to create a new array, we need to be aware of
+                * a few races/collisions:
+                * 1/ 'Create' called by two separate instances of mdadm
+                * 2/ 'Create' versus 'activate_spare': mdadm has chosen
+                *     devices that have since been assimilated via
+                *     activate_spare.
+                * In the event this update can not be carried out mdadm will
+                * (FIX ME) notice that its update did not take hold.
+                */
+               struct imsm_update_create_array *u = (void *) update->buf;
+               struct imsm_dev *dev;
+               struct imsm_map *map, *new_map;
+               unsigned long long start, end;
+               unsigned long long new_start, new_end;
+               int i;
+               int overlap = 0;
+
+               /* handle racing creates: first come first serve */
+               if (u->dev_idx < mpb->num_raid_devs) {
+                       dprintf("%s: subarray %d already defined\n",
+                               __func__, u->dev_idx);
+                       return;
+               }
+
+               /* check update is next in sequence */
+               if (u->dev_idx != mpb->num_raid_devs) {
+                       dprintf("%s: can not create arrays out of sequence\n",
+                               __func__);
+                       return;
+               }
+
+               new_map = &u->dev.vol.map[0];
+               new_start = __le32_to_cpu(new_map->pba_of_lba0);
+               new_end = new_start + __le32_to_cpu(new_map->blocks_per_member);
+
+               /* handle activate_spare versus create race:
+                * check to make sure that overlapping arrays do not include
+                * overalpping disks
+                */
+               for (i = 0; i < mpb->num_raid_devs; i++) {
+                       dev = get_imsm_dev(super, i);
+                       map = &dev->vol.map[0];
+                       start = __le32_to_cpu(map->pba_of_lba0);
+                       end = start + __le32_to_cpu(map->blocks_per_member);
+                       if ((new_start >= start && new_start <= end) ||
+                           (start >= new_start && start <= new_end))
+                               overlap = 1;
+                       if (overlap && disks_overlap(map, new_map)) {
+                               dprintf("%s: arrays overlap\n", __func__);
+                               return;
+                       }
+               }
+               /* check num_members sanity */
+               if (new_map->num_members > mpb->num_disks) {
+                       dprintf("%s: num_disks out of range\n", __func__);
+                       return;
+               }
+
+               /* check that prepare update was successful */
+               if (!update->space) {
+                       dprintf("%s: prepare update failed\n", __func__);
+                       return;
+               }
+
+               super->updates_pending++;
+               dev = update->space;
+               update->space = NULL;
+               imsm_copy_dev(dev, &u->dev);
+               super->dev_tbl[u->dev_idx] = dev;
+               mpb->num_raid_devs++;
+
+               /* fix up flags, if arrays overlap then the drives can not be
+                * spares
+                */
+               for (i = 0; i < map->num_members; i++) {
+                       struct imsm_disk *disk;
+                       __u32 status;
+
+                       disk = get_imsm_disk(super, get_imsm_disk_idx(map, i));
+                       status = __le32_to_cpu(disk->status);
+                       status |= CONFIGURED_DISK;
+                       if (overlap)
+                               status &= ~SPARE_DISK;
+                       disk->status = __cpu_to_le32(status);
+               }
+               break;
+       }
+       }
+}
+
+static void imsm_prepare_update(struct supertype *st,
+                               struct metadata_update *update)
+{
+       /**
+        * Allocate space to hold new disk entries, raid-device entries or a
+        * new mpb if necessary.  We currently maintain an mpb large enough to
+        * hold 2 subarrays for the given number of disks.  This may not be
+        * sufficient when reshaping.
+        *
+        * FIX ME handle the reshape case.
+        *
+        * The monitor will be able to safely change super->mpb by arranging
+        * for it to be freed in check_update_queue().  I.e. the monitor thread
+        * will start using the new pointer and the manager can continue to use
+        * the old value until check_update_queue() runs.
+        */
+       enum imsm_update_type type = *(enum imsm_update_type *) update->buf;
+
+       switch (type) {
+       case update_create_array: {
+               struct imsm_update_create_array *u = (void *) update->buf;
+               size_t len = sizeof_imsm_dev(&u->dev);
+
+               update->space = malloc(len);
+               break;
+       default:
+               break;
+       }
+       }
+
+       return;
+}
+
 struct superswitch super_imsm = {
 #ifndef        MDASSEMBLE
        .examine_super  = examine_super_imsm,
        .brief_examine_super = brief_examine_super_imsm,
        .detail_super   = detail_super_imsm,
        .brief_detail_super = brief_detail_super_imsm,
+       .write_init_super = write_init_super_imsm,
 #endif
        .match_home     = match_home_imsm,
        .uuid_from_super= uuid_from_super_imsm,
@@ -1849,15 +2577,14 @@ struct superswitch super_imsm = {
        .compare_super  = compare_super_imsm,
 
        .load_super     = load_super_imsm,
-       .init_super     = init_zero_imsm,
+       .init_super     = init_super_imsm,
+       .add_to_super   = add_to_super_imsm,
        .store_super    = store_zero_imsm,
        .free_super     = free_super_imsm,
        .match_metadata_desc = match_metadata_desc_imsm,
-       .getinfo_super_n  = getinfo_super_n_imsm_container,
+       .container_content = container_content_imsm,
 
        .validate_geometry = validate_geometry_imsm,
-       .major          = 2000,
-       .swapuuid       = 0,
        .external       = 1,
 
 /* for mdmon */
@@ -1866,52 +2593,7 @@ struct superswitch super_imsm = {
        .set_array_state= imsm_set_array_state,
        .set_disk       = imsm_set_disk,
        .sync_metadata  = imsm_sync_metadata,
-};
-
-/* super_imsm_container is set by validate_geometry_imsm when given a
- * device that is not part of any array
- */
-struct superswitch super_imsm_container = {
-
-       .validate_geometry = validate_geometry_imsm_container,
-       .init_super     = init_super_imsm,
-       .add_to_super   = add_to_super_imsm,
-       .write_init_super = write_init_super_imsm,
-       .getinfo_super  = getinfo_super_imsm,
-       .getinfo_super_n  = getinfo_super_n_imsm_container,
-       .load_super     = load_super_imsm,
-
-#ifndef MDASSEMBLE
-       .examine_super  = examine_super_imsm,
-       .brief_examine_super = brief_examine_super_imsm,
-       .detail_super   = detail_super_imsm,
-       .brief_detail_super = brief_detail_super_imsm,
-#endif
-
-       .free_super     = free_super_imsm,
-
-       .container_content = container_content_imsm,
-
-       .major          = 2000,
-       .swapuuid       = 0,
-       .external       = 1,
-};
-
-struct superswitch super_imsm_volume = {
-       .update_super   = update_super_imsm,
-       .init_super     = init_super_imsm_volume,
-       .add_to_super   = add_to_super_imsm_volume,
-       .getinfo_super  = getinfo_super_imsm_volume,
-       .getinfo_super_n  = getinfo_super_n_imsm_volume,
-       .write_init_super = write_init_super_imsm,
-
-       .load_super     = load_super_imsm,
-       .free_super     = free_super_imsm,
-       .match_metadata_desc = match_metadata_desc_imsm_volume,
-
-
-       .validate_geometry = validate_geometry_imsm_volume,
-       .major          = 2001,
-       .swapuuid       = 0,
-       .external       = 2,
+       .activate_spare = imsm_activate_spare,
+       .process_update = imsm_process_update,
+       .prepare_update = imsm_prepare_update,
 };