]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-ddf.c
Create.c: fix uclibc build
[thirdparty/mdadm.git] / super-ddf.c
index 8c8e886cfd676ded831f09671921767519cd2c6a..21426c753c6dff4d9dfdba152bb2fb8ac503f107 100644 (file)
@@ -500,17 +500,9 @@ struct ddf_super {
        } *dlist, *add_list;
 };
 
-#ifndef MDASSEMBLE
 static int load_super_ddf_all(struct supertype *st, int fd,
                              void **sbp, char *devname);
 static int get_svd_state(const struct ddf_super *, const struct vcl *);
-static int
-validate_geometry_ddf_container(struct supertype *st,
-                               int level, int layout, int raiddisks,
-                               int chunk, unsigned long long size,
-                               unsigned long long data_offset,
-                               char *dev, unsigned long long *freesize,
-                               int verbose);
 
 static int validate_geometry_ddf_bvd(struct supertype *st,
                                     int level, int layout, int raiddisks,
@@ -518,7 +510,6 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
                                     unsigned long long data_offset,
                                     char *dev, unsigned long long *freesize,
                                     int verbose);
-#endif
 
 static void free_super_ddf(struct supertype *st);
 static int all_ff(const char *guid);
@@ -541,15 +532,15 @@ static int init_super_ddf_bvd(struct supertype *st,
 static void pr_state(struct ddf_super *ddf, const char *msg)
 {
        unsigned int i;
-       dprintf("%s/%s: ", __func__, msg);
+       dprintf("%s: ", msg);
        for (i = 0; i < be16_to_cpu(ddf->active->max_vd_entries); i++) {
                if (all_ff(ddf->virt->entries[i].guid))
                        continue;
-               dprintf("%u(s=%02x i=%02x) ", i,
+               dprintf_cont("%u(s=%02x i=%02x) ", i,
                        ddf->virt->entries[i].state,
                        ddf->virt->entries[i].init_state);
        }
-       dprintf("\n");
+       dprintf_cont("\n");
 }
 #else
 static void pr_state(const struct ddf_super *ddf, const char *msg) {}
@@ -672,8 +663,8 @@ static int layout_md2ddf(const mdu_array_info_t *array,
                        sec_elmnt_count = array->raid_disks / 2;
                        srl = DDF_2SPANNED;
                        prl = DDF_RAID1;
-               } else if (array->raid_disks % 3 == 0
-                          && array->layout == 0x103) {
+               } else if (array->raid_disks % 3 == 0 &&
+                          array->layout == 0x103) {
                        rlq = DDF_RAID1_MULTI;
                        prim_elmnt_count =  cpu_to_be16(3);
                        sec_elmnt_count = array->raid_disks / 3;
@@ -825,11 +816,11 @@ static int load_ddf_header(int fd, unsigned long long lba,
                return 0;
 
        if (!be32_eq(hdr->magic, DDF_HEADER_MAGIC)) {
-               pr_err("%s: bad header magic\n", __func__);
+               pr_err("bad header magic\n");
                return 0;
        }
        if (!be32_eq(calc_crc(hdr, 512), hdr->crc)) {
-               pr_err("%s: bad CRC\n", __func__);
+               pr_err("bad CRC\n");
                return 0;
        }
        if (memcmp(anchor->guid, hdr->guid, DDF_GUID_LEN) != 0 ||
@@ -839,7 +830,7 @@ static int load_ddf_header(int fd, unsigned long long lba,
            hdr->type != type ||
            memcmp(anchor->pad2, hdr->pad2, 512 -
                   offsetof(struct ddf_header, pad2)) != 0) {
-               pr_err("%s: header mismatch\n", __func__);
+               pr_err("header mismatch\n");
                return 0;
        }
 
@@ -855,8 +846,8 @@ static void *load_section(int fd, struct ddf_super *super, void *buf,
        int dofree = (buf == NULL);
 
        if (check)
-               if (len != 2 && len != 8 && len != 32
-                   && len != 128 && len != 512)
+               if (len != 2 && len != 8 && len != 32 &&
+                   len != 128 && len != 512)
                        return NULL;
 
        if (len > 1024)
@@ -918,8 +909,7 @@ static int load_ddf_headers(int fd, struct ddf_super *super, char *devname)
        if (memcmp(super->anchor.revision, DDF_REVISION_0, 8) != 0 &&
            memcmp(super->anchor.revision, DDF_REVISION_2, 8) != 0) {
                if (devname)
-                       pr_err("can only support super revision"
-                               " %.8s and earlier, not %.8s on %s\n",
+                       pr_err("can only support super revision %.8s and earlier, not %.8s on %s\n",
                                DDF_REVISION_2, super->anchor.revision,devname);
                return 2;
        }
@@ -928,22 +918,20 @@ static int load_ddf_headers(int fd, struct ddf_super *super, char *devname)
                            dsize >> 9,  1,
                            &super->primary, &super->anchor) == 0) {
                if (devname)
-                       pr_err("Failed to load primary DDF header "
-                              "on %s\n", devname);
+                       pr_err("Failed to load primary DDF header on %s\n", devname);
        } else
                super->active = &super->primary;
 
        if (load_ddf_header(fd, be64_to_cpu(super->anchor.secondary_lba),
                            dsize >> 9,  2,
                            &super->secondary, &super->anchor)) {
-               if (super->active == NULL
-                   || (be32_to_cpu(super->primary.seq)
-                       < be32_to_cpu(super->secondary.seq) &&
-                       !super->secondary.openflag)
-                   || (be32_to_cpu(super->primary.seq)
-                       == be32_to_cpu(super->secondary.seq) &&
-                       super->primary.openflag && !super->secondary.openflag)
-                       )
+               if (super->active == NULL ||
+                   (be32_to_cpu(super->primary.seq)
+                    < be32_to_cpu(super->secondary.seq) &&
+                       !super->secondary.openflag) ||
+                   (be32_to_cpu(super->primary.seq) ==
+                    be32_to_cpu(super->secondary.seq) &&
+                       super->primary.openflag && !super->secondary.openflag))
                        super->active = &super->secondary;
        } else if (devname &&
                   be64_to_cpu(super->anchor.secondary_lba) != ~(__u64)0)
@@ -1055,8 +1043,7 @@ static int load_ddf_local(int fd, struct ddf_super *super,
        if (posix_memalign((void**)&dl, 512,
                           sizeof(*dl) +
                           (super->max_part) * sizeof(dl->vlist[0])) != 0) {
-               pr_err("%s could not allocate disk info buffer\n",
-                      __func__);
+               pr_err("could not allocate disk info buffer\n");
                return 1;
        }
 
@@ -1116,8 +1103,7 @@ static int load_ddf_local(int fd, struct ddf_super *super,
                                continue;
                        if (posix_memalign((void**)&dl->spare, 512,
                                           super->conf_rec_len*512) != 0) {
-                               pr_err("%s could not allocate spare info buf\n",
-                                      __func__);
+                               pr_err("could not allocate spare info buf\n");
                                return 1;
                        }
 
@@ -1148,16 +1134,14 @@ static int load_ddf_local(int fd, struct ddf_super *super,
                        if (posix_memalign((void**)&vcl, 512,
                                           (super->conf_rec_len*512 +
                                            offsetof(struct vcl, conf))) != 0) {
-                               pr_err("%s could not allocate vcl buf\n",
-                                      __func__);
+                               pr_err("could not allocate vcl buf\n");
                                return 1;
                        }
                        vcl->next = super->conflist;
                        vcl->block_sizes = NULL; /* FIXME not for CONCAT */
                        vcl->conf.sec_elmnt_count = vd->sec_elmnt_count;
                        if (alloc_other_bvds(super, vcl) != 0) {
-                               pr_err("%s could not allocate other bvds\n",
-                                      __func__);
+                               pr_err("could not allocate other bvds\n");
                                free(vcl);
                                return 1;
                        };
@@ -1193,15 +1177,13 @@ static int load_super_ddf(struct supertype *st, int fd,
        /* 32M is a lower bound */
        if (dsize <= 32*1024*1024) {
                if (devname)
-                       pr_err("%s is too small for ddf: "
-                              "size is %llu sectors.\n",
+                       pr_err("%s is too small for ddf: size is %llu sectors.\n",
                               devname, dsize>>9);
                return 1;
        }
        if (dsize & 511) {
                if (devname)
-                       pr_err("%s is an odd size for ddf: "
-                              "size is %llu bytes.\n",
+                       pr_err("%s is an odd size for ddf: size is %llu bytes.\n",
                               devname, dsize);
                return 1;
        }
@@ -1227,8 +1209,7 @@ static int load_super_ddf(struct supertype *st, int fd,
 
        if (rv) {
                if (devname)
-                       pr_err("Failed to load all information "
-                              "sections on %s\n", devname);
+                       pr_err("Failed to load all information sections on %s\n", devname);
                free(super);
                return rv;
        }
@@ -1237,8 +1218,7 @@ static int load_super_ddf(struct supertype *st, int fd,
 
        if (rv) {
                if (devname)
-                       pr_err("Failed to load all information "
-                              "sections on %s\n", devname);
+                       pr_err("Failed to load all information sections on %s\n", devname);
                free(super);
                return rv;
        }
@@ -1315,8 +1295,6 @@ static struct supertype *match_metadata_desc_ddf(char *arg)
        return st;
 }
 
-#ifndef MDASSEMBLE
-
 static mapping_t ddf_state[] = {
        { "Optimal", 0},
        { "Degraded", 1},
@@ -1365,7 +1343,6 @@ static mapping_t ddf_sec_level[] = {
        { "Spanned", DDF_2SPANNED},
        { NULL, 0}
 };
-#endif
 
 static int all_ff(const char *guid)
 {
@@ -1392,7 +1369,6 @@ static const char *guid_str(const char *guid)
        return (const char *) buf;
 }
 
-#ifndef MDASSEMBLE
 static void print_guid(char *guid, int tstamp)
 {
        /* A GUIDs are part (or all) ASCII and part binary.
@@ -1494,13 +1470,13 @@ static void examine_vds(struct ddf_super *sb)
                printf("\n");
                printf("         unit[%d] : %d\n", i, be16_to_cpu(ve->unit));
                printf("        state[%d] : %s, %s%s\n", i,
-                      map_num(ddf_state, ve->state & 7),
+                      map_num_s(ddf_state, ve->state & 7),
                       (ve->state & DDF_state_morphing) ? "Morphing, ": "",
                       (ve->state & DDF_state_inconsistent)? "Not Consistent" : "Consistent");
                printf("   init state[%d] : %s\n", i,
-                      map_num(ddf_init_state, ve->init_state&DDF_initstate_mask));
+                      map_num_s(ddf_init_state, ve->init_state & DDF_initstate_mask));
                printf("       access[%d] : %s\n", i,
-                      map_num(ddf_access, (ve->init_state & DDF_access_mask) >> 6));
+                      map_num_s(ddf_access, (ve->init_state & DDF_access_mask) >> 6));
                printf("         Name[%d] : %.16s\n", i, ve->name);
                examine_vd(i, sb, ve->guid);
        }
@@ -1616,15 +1592,20 @@ static unsigned int get_vd_num_of_subarray(struct supertype *st)
        sra = sysfs_read(-1, st->devnm, GET_VERSION);
        if (!sra || sra->array.major_version != -1 ||
            sra->array.minor_version != -2 ||
-           !is_subarray(sra->text_version))
+           !is_subarray(sra->text_version)) {
+               if (sra)
+                       sysfs_free(sra);
                return DDF_NOTFOUND;
+       }
 
        sub = strchr(sra->text_version + 1, '/');
        if (sub != NULL)
                vcnum = strtoul(sub + 1, &end, 10);
        if (sub == NULL || *sub == '\0' || *end != '\0' ||
-           vcnum >= be16_to_cpu(ddf->active->max_vd_entries))
+           vcnum >= be16_to_cpu(ddf->active->max_vd_entries)) {
+               sysfs_free(sra);
                return DDF_NOTFOUND;
+       }
 
        return vcnum;
 }
@@ -1636,7 +1617,7 @@ static void brief_examine_super_ddf(struct supertype *st, int verbose)
        struct mdinfo info;
        char nbuf[64];
        getinfo_super_ddf(st, &info, NULL);
-       fname_from_uuid(st, &info, nbuf, ':');
+       fname_from_uuid(&info, nbuf);
 
        printf("ARRAY metadata=ddf UUID=%s\n", nbuf + 5);
 }
@@ -1651,7 +1632,7 @@ static void brief_examine_subarrays_ddf(struct supertype *st, int verbose)
        unsigned int i;
        char nbuf[64];
        getinfo_super_ddf(st, &info, NULL);
-       fname_from_uuid(st, &info, nbuf, ':');
+       fname_from_uuid(&info, nbuf);
 
        for (i = 0; i < be16_to_cpu(ddf->virt->max_vdes); i++) {
                struct virtual_entry *ve = &ddf->virt->entries[i];
@@ -1664,10 +1645,10 @@ static void brief_examine_subarrays_ddf(struct supertype *st, int verbose)
                ddf->currentconf =&vcl;
                vcl.vcnum = i;
                uuid_from_super_ddf(st, info.uuid);
-               fname_from_uuid(st, &info, nbuf1, ':');
+               fname_from_uuid(&info, nbuf1);
                _ddf_array_name(namebuf, ddf, i);
                printf("ARRAY%s%s container=%s member=%d UUID=%s\n",
-                      namebuf[0] == '\0' ? "" : " /dev/md/", namebuf,
+                      namebuf[0] == '\0' ? "" : " " DEV_MD_DIR, namebuf,
                       nbuf+5, i, nbuf1+5);
        }
 }
@@ -1677,7 +1658,7 @@ static void export_examine_super_ddf(struct supertype *st)
        struct mdinfo info;
        char nbuf[64];
        getinfo_super_ddf(st, &info, NULL);
-       fname_from_uuid(st, &info, nbuf, ':');
+       fname_from_uuid(&info, nbuf);
        printf("MD_METADATA=ddf\n");
        printf("MD_LEVEL=container\n");
        printf("MD_UUID=%s\n", nbuf+5);
@@ -1747,15 +1728,16 @@ err:
        return 1;
 }
 
-static void detail_super_ddf(struct supertype *st, char *homehost)
+static void detail_super_ddf(struct supertype *st, char *homehost,
+                            char *subarray)
 {
        struct ddf_super *sb = st->sb;
        int cnt = be16_to_cpu(sb->virt->populated_vdes);
 
-       printf(" Container GUID : "); print_guid(sb->anchor.guid, 1);
+       printf("    Container GUID : "); print_guid(sb->anchor.guid, 1);
        printf("\n");
-       printf("            Seq : %08x\n", be32_to_cpu(sb->active->seq));
-       printf("  Virtual Disks : %d\n", cnt);
+       printf("               Seq : %08x\n", be32_to_cpu(sb->active->seq));
+       printf("     Virtual Disks : %d\n", cnt);
        printf("\n");
 }
 
@@ -1804,7 +1786,7 @@ static void uuid_of_ddf_subarray(const struct ddf_super *ddf,
        memcpy(uuid, sha, 4*4);
 }
 
-static void brief_detail_super_ddf(struct supertype *st)
+static void brief_detail_super_ddf(struct supertype *st, char *subarray)
 {
        struct mdinfo info;
        char nbuf[64];
@@ -1816,10 +1798,9 @@ static void brief_detail_super_ddf(struct supertype *st)
                return;
        else
                uuid_of_ddf_subarray(ddf, vcnum, info.uuid);
-       fname_from_uuid(st, &info, nbuf,':');
+       fname_from_uuid(&info, nbuf);
        printf(" UUID=%s", nbuf + 5);
 }
-#endif
 
 static int match_home_ddf(struct supertype *st, char *homehost)
 {
@@ -1841,7 +1822,6 @@ static int match_home_ddf(struct supertype *st, char *homehost)
                ddf->controller.vendor_data[len] == 0);
 }
 
-#ifndef MDASSEMBLE
 static int find_index_in_bvd(const struct ddf_super *ddf,
                             const struct vd_config *conf, unsigned int n,
                             unsigned int *n_bvd)
@@ -1863,8 +1843,8 @@ static int find_index_in_bvd(const struct ddf_super *ddf,
                        j++;
                }
        }
-       dprintf("%s: couldn't find BVD member %u (total %u)\n",
-               __func__, n, be16_to_cpu(conf->prim_elmnt_count));
+       dprintf("couldn't find BVD member %u (total %u)\n",
+               n, be16_to_cpu(conf->prim_elmnt_count));
        return 0;
 }
 
@@ -1895,15 +1875,15 @@ static struct vd_config *find_vdcr(struct ddf_super *ddf, unsigned int inst,
                                goto bad;
                }
                if (v->other_bvds == NULL) {
-                       pr_err("%s: BUG: other_bvds is NULL, nsec=%u\n",
-                              __func__, conf->sec_elmnt_count);
+                       pr_err("BUG: other_bvds is NULL, nsec=%u\n",
+                              conf->sec_elmnt_count);
                        goto bad;
                }
                nsec = n / be16_to_cpu(conf->prim_elmnt_count);
                if (conf->sec_elmnt_seq != nsec) {
                        for (ibvd = 1; ibvd < conf->sec_elmnt_count; ibvd++) {
-                               if (v->other_bvds[ibvd-1]->sec_elmnt_seq
-                                   == nsec)
+                               if (v->other_bvds[ibvd-1]->sec_elmnt_seq ==
+                                   nsec)
                                        break;
                        }
                        if (ibvd == conf->sec_elmnt_count)
@@ -1913,16 +1893,15 @@ static struct vd_config *find_vdcr(struct ddf_super *ddf, unsigned int inst,
                if (!find_index_in_bvd(ddf, conf,
                                       n - nsec*conf->sec_elmnt_count, n_bvd))
                        goto bad;
-               dprintf("%s: found disk %u as member %u in bvd %d of array %u\n"
-                       , __func__, n, *n_bvd, ibvd, inst);
+               dprintf("found disk %u as member %u in bvd %d of array %u\n",
+                       n, *n_bvd, ibvd, inst);
                *vcl = v;
                return conf;
        }
 bad:
-       pr_err("%s: Could't find disk %d in array %u\n", __func__, n, inst);
+       pr_err("Couldn't find disk %d in array %u\n", n, inst);
        return NULL;
 }
-#endif
 
 static int find_phys(const struct ddf_super *ddf, be32 phys_refnum)
 {
@@ -2005,12 +1984,14 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *m
                info->disk.number = be32_to_cpu(ddf->dlist->disk.refnum);
                info->disk.raid_disk = find_phys(ddf, ddf->dlist->disk.refnum);
 
+               if (info->disk.raid_disk < 0)
+                       return;
+
                info->data_offset = be64_to_cpu(ddf->phys->
                                                  entries[info->disk.raid_disk].
                                                  config_size);
                info->component_size = ddf->dlist->size - info->data_offset;
-               if (info->disk.raid_disk >= 0)
-                       pde = ddf->phys->entries + info->disk.raid_disk;
+               pde = ddf->phys->entries + info->disk.raid_disk;
                if (pde &&
                    !(be16_to_cpu(pde->state) & DDF_Failed) &&
                    !(be16_to_cpu(pde->state) & DDF_Missing))
@@ -2047,8 +2028,8 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *m
                               be32_to_cpu(ddf->phys->entries[e].refnum) == 0xffffffff)
                                e++;
                        if (i < info->array.raid_disks && e < max &&
-                           !(be16_to_cpu(ddf->phys->entries[e].state)
-                             DDF_Failed))
+                           !(be16_to_cpu(ddf->phys->entries[e].state) &
+                             DDF_Failed))
                                map[i] = 1;
                        else
                                map[i] = 0;
@@ -2074,7 +2055,7 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
        int cd = ddf->currentdev;
        int n_prim;
        int j;
-       struct dl *dl;
+       struct dl *dl = NULL;
        int map_disks = info->array.raid_disks;
        __u32 *cptr;
        struct vd_config *conf;
@@ -2133,11 +2114,10 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
        info->resync_start = 0;
        info->reshape_active = 0;
        info->recovery_blocked = 0;
-       if (!(ddf->virt->entries[info->container_member].state
-             & DDF_state_inconsistent)  &&
-           (ddf->virt->entries[info->container_member].init_state
-            & DDF_initstate_mask)
-           == DDF_init_full)
+       if (!(ddf->virt->entries[info->container_member].state &
+             DDF_state_inconsistent) &&
+           (ddf->virt->entries[info->container_member].init_state &
+            DDF_initstate_mask) == DDF_init_full)
                info->resync_start = MaxSector;
 
        uuid_from_super_ddf(st, info->uuid);
@@ -2154,7 +2134,7 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
        if (map)
                for (j = 0; j < map_disks; j++) {
                        map[j] = 0;
-                       if (j <  info->array.raid_disks) {
+                       if (j < info->array.raid_disks) {
                                int i = find_phys(ddf, vc->conf.phys_refnum[j]);
                                if (i >= 0 &&
                                    (be16_to_cpu(ddf->phys->entries[i].state)
@@ -2166,75 +2146,6 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
                }
 }
 
-static int update_super_ddf(struct supertype *st, struct mdinfo *info,
-                           char *update,
-                           char *devname, int verbose,
-                           int uuid_set, char *homehost)
-{
-       /* For 'assemble' and 'force' we need to return non-zero if any
-        * change was made.  For others, the return value is ignored.
-        * Update options are:
-        *  force-one : This device looks a bit old but needs to be included,
-        *        update age info appropriately.
-        *  assemble: clear any 'faulty' flag to allow this device to
-        *              be assembled.
-        *  force-array: Array is degraded but being forced, mark it clean
-        *         if that will be needed to assemble it.
-        *
-        *  newdev:  not used ????
-        *  grow:  Array has gained a new device - this is currently for
-        *              linear only
-        *  resync: mark as dirty so a resync will happen.
-        *  uuid:  Change the uuid of the array to match what is given
-        *  homehost:  update the recorded homehost
-        *  name:  update the name - preserving the homehost
-        *  _reshape_progress: record new reshape_progress position.
-        *
-        * Following are not relevant for this version:
-        *  sparc2.2 : update from old dodgey metadata
-        *  super-minor: change the preferred_minor number
-        *  summaries:  update redundant counters.
-        */
-       int rv = 0;
-//     struct ddf_super *ddf = st->sb;
-//     struct vd_config *vd = find_vdcr(ddf, info->container_member);
-//     struct virtual_entry *ve = find_ve(ddf);
-
-       /* we don't need to handle "force-*" or "assemble" as
-        * there is no need to 'trick' the kernel.  When the metadata is
-        * first updated to activate the array, all the implied modifications
-        * will just happen.
-        */
-
-       if (strcmp(update, "grow") == 0) {
-               /* FIXME */
-       } else if (strcmp(update, "resync") == 0) {
-//             info->resync_checkpoint = 0;
-       } else if (strcmp(update, "homehost") == 0) {
-               /* homehost is stored in controller->vendor_data,
-                * or it is when we are the vendor
-                */
-//             if (info->vendor_is_local)
-//                     strcpy(ddf->controller.vendor_data, homehost);
-               rv = -1;
-       } else if (strcmp(update, "name") == 0) {
-               /* name is stored in virtual_entry->name */
-//             memset(ve->name, ' ', 16);
-//             strncpy(ve->name, info->name, 16);
-               rv = -1;
-       } else if (strcmp(update, "_reshape_progress") == 0) {
-               /* We don't support reshape yet */
-       } else if (strcmp(update, "assemble") == 0 ) {
-               /* Do nothing, just succeed */
-               rv = 0;
-       } else
-               rv = -1;
-
-//     update_all_csum(ddf);
-
-       return rv;
-}
-
 static void make_header_guid(char *guid)
 {
        be32 stamp;
@@ -2282,7 +2193,6 @@ static unsigned int find_vde_by_name(const struct ddf_super *ddf,
        return DDF_NOTFOUND;
 }
 
-#ifndef MDASSEMBLE
 static unsigned int find_vde_by_guid(const struct ddf_super *ddf,
                                     const char *guid)
 {
@@ -2294,11 +2204,10 @@ static unsigned int find_vde_by_guid(const struct ddf_super *ddf,
                        return i;
        return DDF_NOTFOUND;
 }
-#endif
 
 static int init_super_ddf(struct supertype *st,
                          mdu_array_info_t *info,
-                         unsigned long long size, char *name, char *homehost,
+                         struct shape *s, char *name, char *homehost,
                          int *uuid, unsigned long long data_offset)
 {
        /* This is primarily called by Create when creating a new array.
@@ -2336,11 +2245,11 @@ static int init_super_ddf(struct supertype *st,
        struct virtual_disk *vd;
 
        if (st->sb)
-               return init_super_ddf_bvd(st, info, size, name, homehost, uuid,
+               return init_super_ddf_bvd(st, info, s->size, name, homehost, uuid,
                                          data_offset);
 
        if (posix_memalign((void**)&ddf, 512, sizeof(*ddf)) != 0) {
-               pr_err("%s could not allocate superblock\n", __func__);
+               pr_err("could not allocate superblock\n");
                return 0;
        }
        memset(ddf, 0, sizeof(*ddf));
@@ -2457,8 +2366,7 @@ static int init_super_ddf(struct supertype *st,
         * Remaining 16 are serial number.... maybe a hostname would do?
         */
        memcpy(ddf->controller.guid, T10, sizeof(T10));
-       gethostname(hostname, sizeof(hostname));
-       hostname[sizeof(hostname) - 1] = 0;
+       s_gethostname(hostname, sizeof(hostname));
        hostlen = strlen(hostname);
        memcpy(ddf->controller.guid + 24 - hostlen, hostname, hostlen);
        for (i = strlen(T10) ; i+hostlen < 24; i++)
@@ -2475,7 +2383,7 @@ static int init_super_ddf(struct supertype *st,
                strcpy((char*)ddf->controller.vendor_data, homehost);
 
        if (posix_memalign((void**)&pd, 512, pdsize) != 0) {
-               pr_err("%s could not allocate pd\n", __func__);
+               pr_err("could not allocate pd\n");
                return 0;
        }
        ddf->phys = pd;
@@ -2491,7 +2399,7 @@ static int init_super_ddf(struct supertype *st,
                memset(pd->entries[i].guid, 0xff, DDF_GUID_LEN);
 
        if (posix_memalign((void**)&vd, 512, vdsize) != 0) {
-               pr_err("%s could not allocate vd\n", __func__);
+               pr_err("could not allocate vd\n");
                return 0;
        }
        ddf->virt = vd;
@@ -2515,7 +2423,6 @@ static int chunk_to_shift(int chunksize)
        return ffs(chunksize/512)-1;
 }
 
-#ifndef MDASSEMBLE
 struct extent {
        unsigned long long start, size;
 };
@@ -2616,7 +2523,6 @@ static unsigned long long find_space(
        free(e);
        return INVALID_SECTORS;
 }
-#endif
 
 static int init_super_ddf_bvd(struct supertype *st,
                              mdu_array_info_t *info,
@@ -2661,16 +2567,18 @@ static int init_super_ddf_bvd(struct supertype *st,
                ve->init_state = DDF_init_not;
 
        memset(ve->pad1, 0xff, 14);
-       memset(ve->name, ' ', 16);
-       if (name)
-               strncpy(ve->name, name, 16);
+       memset(ve->name, '\0', sizeof(ve->name));
+       if (name) {
+               int l = strnlen(name, sizeof(ve->name));
+               memcpy(ve->name, name, l);
+       }
        ddf->virt->populated_vdes =
                cpu_to_be16(be16_to_cpu(ddf->virt->populated_vdes)+1);
 
        /* Now create a new vd_config */
        if (posix_memalign((void**)&vcl, 512,
                           (offsetof(struct vcl, conf) + ddf->conf_rec_len * 512)) != 0) {
-               pr_err("%s could not allocate vd_config\n", __func__);
+               pr_err("could not allocate vd_config\n");
                return 0;
        }
        vcl->vcnum = venum;
@@ -2685,22 +2593,21 @@ static int init_super_ddf_bvd(struct supertype *st,
        vc->chunk_shift = chunk_to_shift(info->chunk_size);
        if (layout_md2ddf(info, vc) == -1 ||
                be16_to_cpu(vc->prim_elmnt_count) > ddf->mppe) {
-               pr_err("%s: unsupported RAID level/layout %d/%d with %d disks\n",
-                      __func__, info->level, info->layout, info->raid_disks);
+               pr_err("unsupported RAID level/layout %d/%d with %d disks\n",
+                      info->level, info->layout, info->raid_disks);
                free(vcl);
                return 0;
        }
        vc->sec_elmnt_seq = 0;
        if (alloc_other_bvds(ddf, vcl) != 0) {
-               pr_err("%s could not allocate other bvds\n",
-                      __func__);
+               pr_err("could not allocate other bvds\n");
                free(vcl);
                return 0;
        }
-       vc->blocks = cpu_to_be64(info->size * 2);
+       vc->blocks = cpu_to_be64(size * 2);
        vc->array_blocks = cpu_to_be64(
                calc_array_size(info->level, info->raid_disks, info->layout,
-                               info->chunk_size, info->size*2));
+                               info->chunk_size, size * 2));
        memset(vc->pad1, 0xff, 8);
        vc->spare_refs[0] = cpu_to_be32(0xffffffff);
        vc->spare_refs[1] = cpu_to_be32(0xffffffff);
@@ -2736,7 +2643,6 @@ static int init_super_ddf_bvd(struct supertype *st,
        return 1;
 }
 
-#ifndef MDASSEMBLE
 static void add_to_super_ddf_bvd(struct supertype *st,
                                 mdu_disk_info_t *dk, int fd, char *devname,
                                 unsigned long long data_offset)
@@ -2812,8 +2718,8 @@ static void add_to_super_ddf_bvd(struct supertype *st,
                   cpu_to_be16(DDF_Global_Spare));
        be16_set(ddf->phys->entries[dl->pdnum].type,
                 cpu_to_be16(DDF_Active_in_VD));
-       dprintf("%s: added disk %d/%08x to VD %d/%s as disk %d\n",
-               __func__, dl->pdnum, be32_to_cpu(dl->disk.refnum),
+       dprintf("added disk %d/%08x to VD %d/%s as disk %d\n",
+               dl->pdnum, be32_to_cpu(dl->disk.refnum),
                ddf->currentconf->vcnum, guid_str(vc->guid),
                dk->raid_disk);
        ddf_set_updates_pending(ddf, vc);
@@ -2844,14 +2750,15 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl)
        if (t < cfs) {
                __u64 wsp = cfs - t;
                if (wsp > 1024*1024*2ULL && wsp > dl->size / 16) {
-                       pr_err("%s: %x:%x: workspace size 0x%llx too big, ignoring\n",
-                              __func__, dl->major, dl->minor, wsp);
+                       pr_err("%x:%x: workspace size 0x%llx too big, ignoring\n",
+                              dl->major, dl->minor, (unsigned long long)wsp);
                } else
                        cfs = t;
        }
        pde->config_size = cpu_to_be64(cfs);
-       dprintf("%s: %x:%x config_size %llx, DDF structure is %llx blocks\n",
-               __func__, dl->major, dl->minor, cfs, dl->size-cfs);
+       dprintf("%x:%x config_size %llx, DDF structure is %llx blocks\n",
+               dl->major, dl->minor,
+               (unsigned long long)cfs, (unsigned long long)(dl->size-cfs));
 }
 
 /* Add a device to a container, either while creating it or while
@@ -2882,23 +2789,20 @@ static int add_to_super_ddf(struct supertype *st,
        fstat(fd, &stb);
        n = find_unused_pde(ddf);
        if (n == DDF_NOTFOUND) {
-               pr_err("%s: No free slot in array, cannot add disk\n",
-                      __func__);
+               pr_err("No free slot in array, cannot add disk\n");
                return 1;
        }
        pde = &ddf->phys->entries[n];
        get_dev_size(fd, NULL, &size);
        if (size <= 32*1024*1024) {
-               pr_err("%s: device size must be at least 32MB\n",
-                      __func__);
+               pr_err("device size must be at least 32MB\n");
                return 1;
        }
        size >>= 9;
 
        if (posix_memalign((void**)&dd, 512,
                           sizeof(*dd) + sizeof(dd->vlist[0]) * ddf->max_part) != 0) {
-               pr_err("%s could allocate buffer for new disk, aborting\n",
-                      __func__);
+               pr_err("could allocate buffer for new disk, aborting\n");
                return 1;
        }
        dd->major = major(stb.st_rdev);
@@ -2910,8 +2814,9 @@ static int add_to_super_ddf(struct supertype *st,
        dd->disk.magic = DDF_PHYS_DATA_MAGIC;
        now = time(0);
        tm = localtime(&now);
-       sprintf(dd->disk.guid, "%8s%04d%02d%02d",
-               T10, tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+       sprintf(dd->disk.guid, "%8s%04d%02d%02d", T10,
+               (__u16)tm->tm_year+1900,
+               (__u8)tm->tm_mon+1, (__u8)tm->tm_mday);
        tptr = (__u32 *)(dd->disk.guid + 16);
        *tptr++ = random32();
        *tptr = random32();
@@ -3026,7 +2931,6 @@ static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk)
        }
        return 0;
 }
-#endif
 
 /*
  * This is the write_init_super method for a ddf container.  It is
@@ -3169,6 +3073,7 @@ static int _write_super_to_disk(struct ddf_super *ddf, struct dl *d)
        memcpy(&ddf->primary, &ddf->anchor, 512);
        memcpy(&ddf->secondary, &ddf->anchor, 512);
 
+       ddf->anchor.type = DDF_HEADER_ANCHOR;
        ddf->anchor.openflag = 0xFF; /* 'open' means nothing */
        ddf->anchor.seq = cpu_to_be32(0xFFFFFFFF); /* no sequencing in anchor */
        ddf->anchor.crc = calc_crc(&ddf->anchor, 512);
@@ -3186,7 +3091,6 @@ static int _write_super_to_disk(struct ddf_super *ddf, struct dl *d)
        return 1;
 }
 
-#ifndef MDASSEMBLE
 static int __write_init_super_ddf(struct supertype *st)
 {
        struct ddf_super *ddf = st->sb;
@@ -3269,8 +3173,6 @@ static int write_init_super_ddf(struct supertype *st)
        }
 }
 
-#endif
-
 static __u64 avail_size_ddf(struct supertype *st, __u64 devsize,
                            unsigned long long data_offset)
 {
@@ -3280,8 +3182,6 @@ static __u64 avail_size_ddf(struct supertype *st, __u64 devsize,
        return devsize - 32*1024*2;
 }
 
-#ifndef MDASSEMBLE
-
 static int reserve_space(struct supertype *st, int raiddisks,
                         unsigned long long size, int chunk,
                         unsigned long long data_offset,
@@ -3352,12 +3252,48 @@ static int reserve_space(struct supertype *st, int raiddisks,
        return 1;
 }
 
+static int
+validate_geometry_ddf_container(struct supertype *st,
+                               int level, int raiddisks,
+                               unsigned long long data_offset,
+                               char *dev, unsigned long long *freesize,
+                               int verbose)
+{
+       int fd;
+       unsigned long long ldsize;
+
+       if (!is_container(level))
+               return 0;
+       if (!dev)
+               return 1;
+
+       fd = dev_open(dev, O_RDONLY|O_EXCL);
+       if (fd < 0) {
+               if (verbose)
+                       pr_err("ddf: Cannot open %s: %s\n",
+                              dev, strerror(errno));
+               return 0;
+       }
+       if (!get_dev_size(fd, dev, &ldsize)) {
+               close(fd);
+               return 0;
+       }
+       close(fd);
+       if (freesize) {
+               *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
+               if (*freesize == 0)
+                       return 0;
+       }
+
+       return 1;
+}
+
 static int validate_geometry_ddf(struct supertype *st,
                                 int level, int layout, int raiddisks,
                                 int *chunk, unsigned long long size,
                                 unsigned long long data_offset,
                                 char *dev, unsigned long long *freesize,
-                                int verbose)
+                                int consistency_policy, int verbose)
 {
        int fd;
        struct mdinfo *sra;
@@ -3370,20 +3306,18 @@ static int validate_geometry_ddf(struct supertype *st,
         * If given BVDs, we make an SVD, changing all the GUIDs in the process.
         */
 
-       if (*chunk == UnSet)
-               *chunk = DEFAULT_CHUNK;
-
        if (level == LEVEL_NONE)
                level = LEVEL_CONTAINER;
-       if (level == LEVEL_CONTAINER) {
+       if (is_container(level)) {
                /* Must be a fresh device to add to a container */
-               return validate_geometry_ddf_container(st, level, layout,
-                                                      raiddisks, *chunk,
-                                                      size, data_offset, dev,
-                                                      freesize,
-                                                      verbose);
+               return validate_geometry_ddf_container(st, level, raiddisks,
+                                                      data_offset, dev,
+                                                      freesize, verbose);
        }
 
+       if (*chunk == UnSet)
+               *chunk = DEFAULT_CHUNK;
+
        if (!dev) {
                mdu_array_info_t array = {
                        .level = level,
@@ -3435,8 +3369,7 @@ static int validate_geometry_ddf(struct supertype *st,
                close(fd);
                /* Just a bare device, no good to us */
                if (verbose)
-                       pr_err("ddf: Cannot create this array "
-                              "on device %s - a container is required.\n",
+                       pr_err("ddf: Cannot create this array on device %s - a container is required.\n",
                               dev);
                return 0;
        }
@@ -3480,42 +3413,6 @@ static int validate_geometry_ddf(struct supertype *st,
        return 1;
 }
 
-static int
-validate_geometry_ddf_container(struct supertype *st,
-                               int level, int layout, int raiddisks,
-                               int chunk, unsigned long long size,
-                               unsigned long long data_offset,
-                               char *dev, unsigned long long *freesize,
-                               int verbose)
-{
-       int fd;
-       unsigned long long ldsize;
-
-       if (level != LEVEL_CONTAINER)
-               return 0;
-       if (!dev)
-               return 1;
-
-       fd = open(dev, O_RDONLY|O_EXCL, 0);
-       if (fd < 0) {
-               if (verbose)
-                       pr_err("ddf: Cannot open %s: %s\n",
-                              dev, strerror(errno));
-               return 0;
-       }
-       if (!get_dev_size(fd, dev, &ldsize)) {
-               close(fd);
-               return 0;
-       }
-       close(fd);
-
-       *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
-       if (*freesize == 0)
-               return 0;
-
-       return 1;
-}
-
 static int validate_geometry_ddf_bvd(struct supertype *st,
                                     int level, int layout, int raiddisks,
                                     int *chunk, unsigned long long size,
@@ -3523,12 +3420,12 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
                                     char *dev, unsigned long long *freesize,
                                     int verbose)
 {
-       struct stat stb;
+       dev_t rdev;
        struct ddf_super *ddf = st->sb;
        struct dl *dl;
        unsigned long long maxsize;
        /* ddf/bvd supports lots of things, but not containers */
-       if (level == LEVEL_CONTAINER) {
+       if (is_container(level)) {
                if (verbose)
                        pr_err("DDF cannot create a container within an container\n");
                return 0;
@@ -3546,33 +3443,29 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
                if (minsize == 0)
                        minsize = 8;
                for (dl = ddf->dlist; dl ; dl = dl->next) {
-                       if (find_space(ddf, dl, data_offset, &minsize)
-                           != INVALID_SECTORS)
+                       if (find_space(ddf, dl, data_offset, &minsize) !=
+                           INVALID_SECTORS)
                                dcnt++;
                }
                if (dcnt < raiddisks) {
                        if (verbose)
-                               pr_err("ddf: Not enough devices with "
-                                      "space for this array (%d < %d)\n",
+                               pr_err("ddf: Not enough devices with space for this array (%d < %d)\n",
                                       dcnt, raiddisks);
                        return 0;
                }
                return 1;
        }
        /* This device must be a member of the set */
-       if (stat(dev, &stb) < 0)
-               return 0;
-       if ((S_IFMT & stb.st_mode) != S_IFBLK)
+       if (!stat_is_blkdev(dev, &rdev))
                return 0;
        for (dl = ddf->dlist ; dl ; dl = dl->next) {
-               if (dl->major == (int)major(stb.st_rdev) &&
-                   dl->minor == (int)minor(stb.st_rdev))
+               if (dl->major == (int)major(rdev) &&
+                   dl->minor == (int)minor(rdev))
                        break;
        }
        if (!dl) {
                if (verbose)
-                       pr_err("ddf: %s is not in the "
-                              "same DDF set\n",
+                       pr_err("ddf: %s is not in the same DDF set\n",
                               dev);
                return 0;
        }
@@ -3594,7 +3487,7 @@ static int load_super_ddf_all(struct supertype *st, int fd,
        char nm[20];
        int dfd;
 
-       sra = sysfs_read(fd, 0, GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE);
+       sra = sysfs_read(fd, NULL, GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE);
        if (!sra)
                return 1;
        if (sra->array.major_version != -1 ||
@@ -3666,8 +3559,6 @@ static int load_container_ddf(struct supertype *st, int fd,
        return load_super_ddf_all(st, fd, &st->sb, devname);
 }
 
-#endif /* MDASSEMBLE */
-
 static int check_secondary(const struct vcl *vc)
 {
        const struct vd_config *conf = &vc->conf;
@@ -3855,13 +3746,13 @@ static struct mdinfo *container_content_ddf(struct supertype *st, char *subarray
                        unsigned int iphys;
                        int stt;
 
-                       if (be32_to_cpu(ddf->phys->entries[pd].refnum)
-                           == 0xFFFFFFFF)
+                       if (be32_to_cpu(ddf->phys->entries[pd].refnum) ==
+                           0xffffffff)
                                continue;
 
                        stt = be16_to_cpu(ddf->phys->entries[pd].state);
-                       if ((stt & (DDF_Online|DDF_Failed|DDF_Rebuilding))
-                           != DDF_Online)
+                       if ((stt & (DDF_Online|DDF_Failed|DDF_Rebuilding)) !=
+                           DDF_Online)
                                continue;
 
                        i = get_pd_index_from_refnum(
@@ -3921,8 +3812,7 @@ static int store_super_ddf(struct supertype *st, int fd)
                int ofd, ret;
 
                if (fstat(fd, &sta) == -1 || !S_ISBLK(sta.st_mode)) {
-                       pr_err("%s: file descriptor for invalid device\n",
-                              __func__);
+                       pr_err("file descriptor for invalid device\n");
                        return 1;
                }
                for (dl = ddf->dlist; dl; dl = dl->next)
@@ -3930,7 +3820,7 @@ static int store_super_ddf(struct supertype *st, int fd)
                            dl->minor == (int)minor(sta.st_rdev))
                                break;
                if (!dl) {
-                       pr_err("%s: couldn't find disk %d/%d\n", __func__,
+                       pr_err("couldn't find disk %d/%d\n",
                               (int)major(sta.st_rdev),
                               (int)minor(sta.st_rdev));
                        return 1;
@@ -3954,7 +3844,8 @@ static int store_super_ddf(struct supertype *st, int fd)
        return 0;
 }
 
-static int compare_super_ddf(struct supertype *st, struct supertype *tst)
+static int compare_super_ddf(struct supertype *st, struct supertype *tst,
+                            int verbose)
 {
        /*
         * return:
@@ -3984,7 +3875,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
         */
 
        if (!be32_eq(first->active->seq, second->active->seq)) {
-               dprintf("%s: sequence number mismatch %u<->%u\n", __func__,
+               dprintf("sequence number mismatch %u<->%u\n",
                        be32_to_cpu(first->active->seq),
                        be32_to_cpu(second->active->seq));
                return 0;
@@ -4006,7 +3897,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                        if (vl1->other_bvds != NULL &&
                            vl1->conf.sec_elmnt_seq !=
                            vl2->conf.sec_elmnt_seq) {
-                               dprintf("%s: adding BVD %u\n", __func__,
+                               dprintf("adding BVD %u\n",
                                        vl2->conf.sec_elmnt_seq);
                                add_other_bvd(vl1, &vl2->conf,
                                              first->conf_rec_len*512);
@@ -4017,8 +3908,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                if (posix_memalign((void **)&vl1, 512,
                                   (first->conf_rec_len*512 +
                                    offsetof(struct vcl, conf))) != 0) {
-                       pr_err("%s could not allocate vcl buf\n",
-                              __func__);
+                       pr_err("could not allocate vcl buf\n");
                        return 3;
                }
 
@@ -4026,8 +3916,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                vl1->block_sizes = NULL;
                memcpy(&vl1->conf, &vl2->conf, first->conf_rec_len*512);
                if (alloc_other_bvds(first, vl1) != 0) {
-                       pr_err("%s could not allocate other bvds\n",
-                              __func__);
+                       pr_err("could not allocate other bvds\n");
                        free(vl1);
                        return 3;
                }
@@ -4036,7 +3925,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                                    vl1->conf.guid, DDF_GUID_LEN))
                                break;
                vl1->vcnum = vd;
-               dprintf("%s: added config for VD %u\n", __func__, vl1->vcnum);
+               dprintf("added config for VD %u\n", vl1->vcnum);
                first->conflist = vl1;
        }
 
@@ -4048,10 +3937,9 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                        continue;
 
                if (posix_memalign((void **)&dl1, 512,
-                      sizeof(*dl1) + (first->max_part) * sizeof(dl1->vlist[0]))
-                   != 0) {
-                       pr_err("%s could not allocate disk info buffer\n",
-                       __func__);
+                                  sizeof(*dl1) + (first->max_part) *
+                                  sizeof(dl1->vlist[0])) != 0) {
+                       pr_err("could not allocate disk info buffer\n");
                        return 3;
                }
                memcpy(dl1, dl2, sizeof(*dl1));
@@ -4066,8 +3954,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                if (dl2->spare) {
                        if (posix_memalign((void **)&dl1->spare, 512,
                                       first->conf_rec_len*512) != 0) {
-                               pr_err("%s could not allocate spare info buf\n",
-                                      __func__);
+                               pr_err("could not allocate spare info buf\n");
                                return 3;
                        }
                        memcpy(dl1->spare, dl2->spare, first->conf_rec_len*512);
@@ -4086,57 +3973,54 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                        }
                }
                first->dlist = dl1;
-               dprintf("%s: added disk %d: %08x\n", __func__, dl1->pdnum,
+               dprintf("added disk %d: %08x\n", dl1->pdnum,
                        be32_to_cpu(dl1->disk.refnum));
        }
 
        return 0;
 }
 
-#ifndef MDASSEMBLE
 /*
  * A new array 'a' has been started which claims to be instance 'inst'
  * within container 'c'.
  * We need to confirm that the array matches the metadata in 'c' so
  * that we don't corrupt any metadata.
  */
-static int ddf_open_new(struct supertype *c, struct active_array *a, char *inst)
+static int ddf_open_new(struct supertype *c, struct active_array *a, int inst)
 {
        struct ddf_super *ddf = c->sb;
-       int n = atoi(inst);
        struct mdinfo *dev;
        struct dl *dl;
        static const char faulty[] = "faulty";
 
-       if (all_ff(ddf->virt->entries[n].guid)) {
-               pr_err("%s: subarray %d doesn't exist\n", __func__, n);
+       if (all_ff(ddf->virt->entries[inst].guid)) {
+               pr_err("subarray %d doesn't exist\n", inst);
                return -ENODEV;
        }
-       dprintf("%s: new subarray %d, GUID: %s\n", __func__, n,
-               guid_str(ddf->virt->entries[n].guid));
+       dprintf("new subarray %d, GUID: %s\n", inst,
+               guid_str(ddf->virt->entries[inst].guid));
        for (dev = a->info.devs; dev; dev = dev->next) {
                for (dl = ddf->dlist; dl; dl = dl->next)
                        if (dl->major == dev->disk.major &&
                            dl->minor == dev->disk.minor)
                                break;
                if (!dl || dl->pdnum < 0) {
-                       pr_err("%s: device %d/%d of subarray %d not found in meta data\n",
-                               __func__, dev->disk.major, dev->disk.minor, n);
+                       pr_err("device %d/%d of subarray %d not found in meta data\n",
+                               dev->disk.major, dev->disk.minor, inst);
                        return -1;
                }
                if ((be16_to_cpu(ddf->phys->entries[dl->pdnum].state) &
                        (DDF_Online|DDF_Missing|DDF_Failed)) != DDF_Online) {
-                       pr_err("%s: new subarray %d contains broken device %d/%d (%02x)\n",
-                               __func__, n, dl->major, dl->minor,
-                               be16_to_cpu(
-                                       ddf->phys->entries[dl->pdnum].state));
+                       pr_err("new subarray %d contains broken device %d/%d (%02x)\n",
+                              inst, dl->major, dl->minor,
+                              be16_to_cpu(ddf->phys->entries[dl->pdnum].state));
                        if (write(dev->state_fd, faulty, sizeof(faulty)-1) !=
                            sizeof(faulty) - 1)
                                pr_err("Write to state_fd failed\n");
                        dev->curr_state = DS_FAULTY;
                }
        }
-       a->info.container_member = n;
+       a->info.container_member = inst;
        return 0;
 }
 
@@ -4253,8 +4137,8 @@ static int get_bvd_state(const struct ddf_super *ddf,
                if (pd < 0)
                        continue;
                st = be16_to_cpu(ddf->phys->entries[pd].state);
-               if ((st & (DDF_Online|DDF_Failed|DDF_Rebuilding))
-                   == DDF_Online) {
+               if ((st & (DDF_Online|DDF_Failed|DDF_Rebuilding)) ==
+                   DDF_Online) {
                        working++;
                        avail[i] = 1;
                }
@@ -4353,7 +4237,7 @@ static void ddf_set_disk(struct active_array *a, int n, int state)
        struct dl *dl;
        int update = 0;
 
-       dprintf("%s: %d to %x\n", __func__, n, state);
+       dprintf("%d to %x\n", n, state);
        if (vc == NULL) {
                dprintf("ddf: cannot find instance %d!!\n", inst);
                return;
@@ -4363,8 +4247,7 @@ static void ddf_set_disk(struct active_array *a, int n, int state)
                if (mdi->disk.raid_disk == n)
                        break;
        if (!mdi) {
-               pr_err("%s: cannot find raid disk %d\n",
-                      __func__, n);
+               pr_err("cannot find raid disk %d\n", n);
                return;
        }
 
@@ -4375,9 +4258,8 @@ static void ddf_set_disk(struct active_array *a, int n, int state)
                    mdi->disk.minor == dl->minor)
                        break;
        if (!dl) {
-               pr_err("%s: cannot find raid disk %d (%d/%d)\n",
-                      __func__, n,
-                      mdi->disk.major, mdi->disk.minor);
+               pr_err("cannot find raid disk %d (%d/%d)\n",
+                      n, mdi->disk.major, mdi->disk.minor);
                return;
        }
 
@@ -4385,11 +4267,11 @@ static void ddf_set_disk(struct active_array *a, int n, int state)
        if (pd < 0 || pd != dl->pdnum) {
                /* disk doesn't currently exist or has changed.
                 * If it is now in_sync, insert it. */
-               dprintf("%s: phys disk not found for %d: %d/%d ref %08x\n",
-                       __func__, dl->pdnum, dl->major, dl->minor,
+               dprintf("phys disk not found for %d: %d/%d ref %08x\n",
+                       dl->pdnum, dl->major, dl->minor,
                        be32_to_cpu(dl->disk.refnum));
-               dprintf("%s: array %u disk %u ref %08x pd %d\n",
-                       __func__, inst, n_bvd,
+               dprintf("array %u disk %u ref %08x pd %d\n",
+                       inst, n_bvd,
                        be32_to_cpu(vc->phys_refnum[n_bvd]), pd);
                if ((state & DS_INSYNC) && ! (state & DS_FAULTY) &&
                    dl->pdnum >= 0) {
@@ -4476,13 +4358,11 @@ static int _kill_subarray_ddf(struct ddf_super *ddf, const char *guid)
        unsigned int vdnum, i;
        vdnum = find_vde_by_guid(ddf, guid);
        if (vdnum == DDF_NOTFOUND) {
-               pr_err("%s: could not find VD %s\n", __func__,
-                      guid_str(guid));
+               pr_err("could not find VD %s\n", guid_str(guid));
                return -1;
        }
        if (del_from_conflist(&ddf->conflist, guid) == 0) {
-               pr_err("%s: could not find conf %s\n", __func__,
-                      guid_str(guid));
+               pr_err("could not find conf %s\n", guid_str(guid));
                return -1;
        }
        for (dl = ddf->dlist; dl; dl = dl->next)
@@ -4492,11 +4372,11 @@ static int _kill_subarray_ddf(struct ddf_super *ddf, const char *guid)
                                    DDF_GUID_LEN))
                                dl->vlist[i] = NULL;
        memset(ddf->virt->entries[vdnum].guid, 0xff, DDF_GUID_LEN);
-       dprintf("%s: deleted %s\n", __func__, guid_str(guid));
+       dprintf("deleted %s\n", guid_str(guid));
        return 0;
 }
 
-static int kill_subarray_ddf(struct supertype *st)
+static int kill_subarray_ddf(struct supertype *st, char *subarray_id)
 {
        struct ddf_super *ddf = st->sb;
        /*
@@ -4509,14 +4389,13 @@ static int kill_subarray_ddf(struct supertype *st)
 
        ddf->currentconf = NULL;
        if (!victim) {
-               pr_err("%s: nothing to kill\n", __func__);
+               pr_err("nothing to kill\n");
                return -1;
        }
        conf = &victim->conf;
        vdnum = find_vde_by_guid(ddf, conf->guid);
        if (vdnum == DDF_NOTFOUND) {
-               pr_err("%s: could not find VD %s\n", __func__,
-                      guid_str(conf->guid));
+               pr_err("could not find VD %s\n", guid_str(conf->guid));
                return -1;
        }
        if (st->update_tail) {
@@ -4525,8 +4404,7 @@ static int kill_subarray_ddf(struct supertype *st)
                        + sizeof(struct virtual_entry);
                vd = xmalloc(len);
                if (vd == NULL) {
-                       pr_err("%s: failed to allocate %d bytes\n", __func__,
-                              len);
+                       pr_err("failed to allocate %d bytes\n", len);
                        return -1;
                }
                memset(vd, 0 , len);
@@ -4561,7 +4439,7 @@ static void copy_matching_bvd(struct ddf_super *ddf,
                        return;
                }
        }
-       pr_err("%s: no match for BVD %d of %s in update\n", __func__,
+       pr_err("no match for BVD %d of %s in update\n",
               conf->sec_elmnt_seq, guid_str(conf->guid));
 }
 
@@ -4633,8 +4511,8 @@ static void ddf_process_virt_update(struct supertype *st,
        } else {
                ent = find_vde_by_guid(ddf, vd->entries[0].guid);
                if (ent != DDF_NOTFOUND) {
-                       dprintf("%s: VD %s exists already in slot %d\n",
-                               __func__, guid_str(vd->entries[0].guid),
+                       dprintf("VD %s exists already in slot %d\n",
+                               guid_str(vd->entries[0].guid),
                                ent);
                        return;
                }
@@ -4646,8 +4524,8 @@ static void ddf_process_virt_update(struct supertype *st,
                        cpu_to_be16(
                                1 + be16_to_cpu(
                                        ddf->virt->populated_vdes));
-               dprintf("%s: added VD %s in slot %d(s=%02x i=%02x)\n",
-                       __func__, guid_str(vd->entries[0].guid), ent,
+               dprintf("added VD %s in slot %d(s=%02x i=%02x)\n",
+                       guid_str(vd->entries[0].guid), ent,
                        ddf->virt->entries[ent].state,
                        ddf->virt->entries[ent].init_state);
        }
@@ -4670,9 +4548,9 @@ static void ddf_remove_failed(struct ddf_super *ddf)
                    0xFFFFFFFF)
                        continue;
                if (be16_and(ddf->phys->entries[pdnum].state,
-                            cpu_to_be16(DDF_Failed))
-                   && be16_and(ddf->phys->entries[pdnum].state,
-                               cpu_to_be16(DDF_Transition))) {
+                            cpu_to_be16(DDF_Failed)) &&
+                   be16_and(ddf->phys->entries[pdnum].state,
+                            cpu_to_be16(DDF_Transition))) {
                        /* skip this one unless in dlist*/
                        for (dl = ddf->dlist; dl; dl = dl->next)
                                if (dl->pdnum == (int)pdnum)
@@ -4784,15 +4662,15 @@ static void ddf_process_conf_update(struct supertype *st,
        vc = (struct vd_config*)update->buf;
        len = ddf->conf_rec_len * 512;
        if ((unsigned int)update->len != len * vc->sec_elmnt_count) {
-               pr_err("%s: %s: insufficient data (%d) for %u BVDs\n",
-                      __func__, guid_str(vc->guid), update->len,
+               pr_err("%s: insufficient data (%d) for %u BVDs\n",
+                      guid_str(vc->guid), update->len,
                       vc->sec_elmnt_count);
                return;
        }
        for (vcl = ddf->conflist; vcl ; vcl = vcl->next)
                if (memcmp(vcl->conf.guid, vc->guid, DDF_GUID_LEN) == 0)
                        break;
-       dprintf("%s: conf update for %s (%s)\n", __func__,
+       dprintf("conf update for %s (%s)\n",
                guid_str(vc->guid), (vcl ? "old" : "new"));
        if (vcl) {
                /* An update, just copy the phys_refnum and lba_offset
@@ -4904,31 +4782,39 @@ static void ddf_process_update(struct supertype *st,
        /* case DDF_SPARE_ASSIGN_MAGIC */
 }
 
-static void ddf_prepare_update(struct supertype *st,
-                              struct metadata_update *update)
+static int ddf_prepare_update(struct supertype *st,
+                             struct metadata_update *update)
 {
        /* This update arrived at managemon.
         * We are about to pass it to monitor.
         * If a malloc is needed, do it here.
         */
        struct ddf_super *ddf = st->sb;
-       be32 *magic = (be32 *)update->buf;
+       be32 *magic;
+       if (update->len < 4)
+               return 0;
+       magic = (be32 *)update->buf;
        if (be32_eq(*magic, DDF_VD_CONF_MAGIC)) {
                struct vcl *vcl;
-               struct vd_config *conf = (struct vd_config *) update->buf;
+               struct vd_config *conf;
+               if (update->len < (int)sizeof(*conf))
+                       return 0;
+               conf = (struct vd_config *) update->buf;
                if (posix_memalign(&update->space, 512,
                                   offsetof(struct vcl, conf)
                                   + ddf->conf_rec_len * 512) != 0) {
                        update->space = NULL;
-                       return;
+                       return 0;
                }
                vcl = update->space;
                vcl->conf.sec_elmnt_count = conf->sec_elmnt_count;
                if (alloc_other_bvds(ddf, vcl) != 0) {
                        free(update->space);
                        update->space = NULL;
+                       return 0;
                }
        }
+       return 1;
 }
 
 /*
@@ -4952,21 +4838,20 @@ static int raid10_degraded(struct mdinfo *info)
        for (d = info->devs; d; d = d->next) {
                i = d->disk.raid_disk / n_prim;
                if (i >= n_bvds) {
-                       pr_err("%s: BUG: invalid raid disk\n", __func__);
+                       pr_err("BUG: invalid raid disk\n");
                        goto out;
                }
-               if (d->state_fd > 0)
+               if (is_fd_valid(d->state_fd))
                        found[i]++;
        }
        ret = 2;
        for (i = 0; i < n_bvds; i++)
                if (!found[i]) {
-                       dprintf("%s: BVD %d/%d failed\n", __func__, i, n_bvds);
+                       dprintf("BVD %d/%d failed\n", i, n_bvds);
                        ret = 0;
                        goto out;
                } else if (found[i] < n_prim) {
-                       dprintf("%s: BVD %d/%d degraded\n", __func__, i,
-                               n_bvds);
+                       dprintf("BVD %d/%d degraded\n", i, n_bvds);
                        ret = 1;
                }
 out:
@@ -5015,7 +4900,7 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
                        working ++;
        }
 
-       dprintf("%s: working=%d (%d) level=%d\n", __func__, working,
+       dprintf("working=%d (%d) level=%d\n", working,
                a->info.array.raid_disks,
                a->info.array.level);
        if (working == a->info.array.raid_disks)
@@ -5167,13 +5052,16 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
         */
        vc = find_vdcr(ddf, a->info.container_member, rv->disk.raid_disk,
                       &n_bvd, &vcl);
-       if (vc == NULL)
+       if (vc == NULL) {
+               free(rv);
                return NULL;
+       }
 
        mu = xmalloc(sizeof(*mu));
        if (posix_memalign(&mu->space, 512, sizeof(struct vcl)) != 0) {
                free(mu);
-               mu = NULL;
+               free(rv);
+               return NULL;
        }
 
        mu->len = ddf->conf_rec_len * 512 * vcl->conf.sec_elmnt_count;
@@ -5196,13 +5084,15 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
                vc = (struct vd_config *)(mu->buf
                                          + i_sec * ddf->conf_rec_len * 512);
                for (dl = ddf->dlist; dl; dl = dl->next)
-                       if (dl->major == di->disk.major
-                           && dl->minor == di->disk.minor)
+                       if (dl->major == di->disk.major &&
+                           dl->minor == di->disk.minor)
                                break;
                if (!dl || dl->pdnum < 0) {
-                       pr_err("%s: BUG: can't find disk %d (%d/%d)\n",
-                              __func__, di->disk.raid_disk,
+                       pr_err("BUG: can't find disk %d (%d/%d)\n",
+                              di->disk.raid_disk,
                               di->disk.major, di->disk.minor);
+                       free(mu);
+                       free(rv);
                        return NULL;
                }
                vc->phys_refnum[i_prim] = ddf->phys->entries[dl->pdnum].refnum;
@@ -5214,7 +5104,6 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
        *updates = mu;
        return rv;
 }
-#endif /* MDASSEMBLE */
 
 static int ddf_level_to_layout(int level)
 {
@@ -5243,7 +5132,6 @@ static void default_geometry_ddf(struct supertype *st, int *level, int *layout,
 }
 
 struct superswitch super_ddf = {
-#ifndef        MDASSEMBLE
        .examine_super  = examine_super_ddf,
        .brief_examine_super = brief_examine_super_ddf,
        .brief_examine_subarrays = brief_examine_subarrays_ddf,
@@ -5257,11 +5145,9 @@ struct superswitch super_ddf = {
        .load_container = load_container_ddf,
        .copy_metadata = copy_metadata_ddf,
        .kill_subarray  = kill_subarray_ddf,
-#endif
        .match_home     = match_home_ddf,
        .uuid_from_super= uuid_from_super_ddf,
        .getinfo_super  = getinfo_super_ddf,
-       .update_super   = update_super_ddf,
 
        .avail_size     = avail_size_ddf,
 
@@ -5276,8 +5162,8 @@ struct superswitch super_ddf = {
        .default_geometry = default_geometry_ddf,
 
        .external       = 1,
+       .swapuuid       = 0,
 
-#ifndef MDASSEMBLE
 /* for mdmon */
        .open_new       = ddf_open_new,
        .set_array_state= ddf_set_array_state,
@@ -5286,6 +5172,5 @@ struct superswitch super_ddf = {
        .process_update = ddf_process_update,
        .prepare_update = ddf_prepare_update,
        .activate_spare = ddf_activate_spare,
-#endif
        .name = "ddf",
 };