]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-ddf.c
sysfs: Avoid if and return on the same line
[thirdparty/mdadm.git] / super-ddf.c
index 8c8e886cfd676ded831f09671921767519cd2c6a..1707ad1e1a18d4c08dec6021ad8c15100e882563 100644 (file)
@@ -541,15 +541,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) {}
@@ -825,11 +825,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 +839,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;
        }
 
@@ -918,8 +918,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,8 +927,7 @@ 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;
 
@@ -1055,8 +1053,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 +1113,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 +1144,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 +1187,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 +1219,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 +1228,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;
        }
@@ -1758,6 +1748,7 @@ static void detail_super_ddf(struct supertype *st, char *homehost)
        printf("  Virtual Disks : %d\n", cnt);
        printf("\n");
 }
+#endif
 
 static const char *vendors_with_variable_volume_UUID[] = {
        "LSI      ",
@@ -1804,6 +1795,7 @@ static void uuid_of_ddf_subarray(const struct ddf_super *ddf,
        memcpy(uuid, sha, 4*4);
 }
 
+#ifndef MDASSEMBLE
 static void brief_detail_super_ddf(struct supertype *st)
 {
        struct mdinfo info;
@@ -1863,8 +1855,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,8 +1887,8 @@ 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);
@@ -1913,13 +1905,13 @@ 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("Could't find disk %d in array %u\n", n, inst);
        return NULL;
 }
 #endif
@@ -2074,7 +2066,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;
@@ -2340,7 +2332,7 @@ static int init_super_ddf(struct supertype *st,
                                          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));
@@ -2475,7 +2467,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 +2483,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;
@@ -2670,7 +2662,7 @@ static int init_super_ddf_bvd(struct supertype *st,
        /* 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 +2677,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);
@@ -2812,8 +2803,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 +2835,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 +2874,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);
@@ -3169,6 +3158,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);
@@ -3435,8 +3425,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;
        }
@@ -3552,8 +3541,7 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
                }
                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;
                }
@@ -3571,8 +3559,7 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
        }
        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;
        }
@@ -3921,8 +3908,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 +3916,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;
@@ -3984,7 +3970,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 +3992,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 +4003,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 +4011,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 +4020,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;
        }
 
@@ -4050,8 +4034,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
                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__);
+                       pr_err("could not allocate disk info buffer\n");
                        return 3;
                }
                memcpy(dl1, dl2, sizeof(*dl1));
@@ -4066,8 +4049,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,7 +4068,7 @@ 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));
        }
 
@@ -4109,10 +4091,10 @@ static int ddf_open_new(struct supertype *c, struct active_array *a, char *inst)
        static const char faulty[] = "faulty";
 
        if (all_ff(ddf->virt->entries[n].guid)) {
-               pr_err("%s: subarray %d doesn't exist\n", __func__, n);
+               pr_err("subarray %d doesn't exist\n", n);
                return -ENODEV;
        }
-       dprintf("%s: new subarray %d, GUID: %s\n", __func__, n,
+       dprintf("new subarray %d, GUID: %s\n", n,
                guid_str(ddf->virt->entries[n].guid));
        for (dev = a->info.devs; dev; dev = dev->next) {
                for (dl = ddf->dlist; dl; dl = dl->next)
@@ -4120,16 +4102,15 @@ static int ddf_open_new(struct supertype *c, struct active_array *a, char *inst)
                            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, n);
                        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",
+                              n, 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");
@@ -4353,7 +4334,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 +4344,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 +4355,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 +4364,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 +4455,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,7 +4469,7 @@ 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;
 }
 
@@ -4509,14 +4486,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 +4501,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 +4536,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 +4608,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 +4621,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);
        }
@@ -4784,15 +4759,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 +4879,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,7 +4935,7 @@ 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)
@@ -4961,12 +4944,11 @@ static int raid10_degraded(struct mdinfo *info)
        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 +4997,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)
@@ -5200,8 +5182,8 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
                            && 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);
                        return NULL;
                }