X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=super-ddf.c;h=aefe25ef25cb22f07e951fc2b7dbb37712894ffb;hp=378a5d2b4c75995e14127d2a4cf2b866466a712e;hb=edd8d13c0247b8df5876a94c2d61d74d2cf62c7e;hpb=f7e7067b47d2ca9994f9222dfa5833ac84ce3b22

diff --git a/super-ddf.c b/super-ddf.c
index 378a5d2b..aefe25ef 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -401,6 +401,7 @@ struct ddf_super {
 	struct virtual_disk	*virt;
 	int pdsize, vdsize;
 	int max_part, mppe, conf_rec_len;
+	int currentdev;
 	struct vcl {
 		struct vcl	*next;
 		__u64		*lba_offset; /* location in 'conf' of
@@ -408,13 +409,14 @@ struct ddf_super {
 		int	vcnum; /* index into ->virt */
 		__u64		*block_sizes; /* NULL if all the same */
 		struct vd_config conf;
-	} *conflist, *newconf;
+	} *conflist, *currentconf;
 	struct dl {
 		struct dl	*next;
 		struct disk_data disk;
 		int major, minor;
 		char *devname;
 		int fd;
+		unsigned long long size; /* sectors */
 		int pdnum;	/* index in ->phys */
 		struct spare_assign *spare;
 		struct vcl *vlist[0]; /* max_part in size */
@@ -425,7 +427,6 @@ struct ddf_super {
 #define offsetof(t,f) ((size_t)&(((t*)0)->f))
 #endif
 
-static struct superswitch super_ddf_container, super_ddf_bvd, super_ddf_svd;
 
 static int calc_crc(void *buf, int len)
 {
@@ -628,6 +629,7 @@ static int load_ddf_local(int fd, struct ddf_super *super,
 	int i;
 	int vnum;
 	int max_virt_disks = __be16_to_cpu(super->active->max_vd_entries);
+	unsigned long long dsize;
 
 	/* First the local disk info */
 	dl = malloc(sizeof(*dl) +
@@ -644,6 +646,10 @@ static int load_ddf_local(int fd, struct ddf_super *super,
 	dl->minor = minor(stb.st_rdev);
 	dl->next = super->dlist;
 	dl->fd = keep ? fd : -1;
+
+	dl->size = 0;
+	if (get_dev_size(fd, devname, &dsize))
+		dl->size = dsize >> 9;
 	dl->spare = NULL;
 	for (i=0 ; i < super->max_part ; i++)
 		dl->vlist[i] = NULL;
@@ -845,40 +851,6 @@ static struct supertype *match_metadata_desc_ddf(char *arg)
 	return st;
 }
 
-static struct supertype *match_metadata_desc_ddf_bvd(char *arg)
-{
-	struct supertype *st;
-	if (strcmp(arg, "ddf/bvd") != 0 &&
-	    strcmp(arg, "bvd") != 0 &&
-	    strcmp(arg, "default") != 0
-		)
-		return NULL;
-
-	st = malloc(sizeof(*st));
-	memset(st, 0, sizeof(*st));
-	st->ss = &super_ddf_bvd;
-	st->max_devs = 512;
-	st->minor_version = 0;
-	st->sb = NULL;
-	return st;
-}
-static struct supertype *match_metadata_desc_ddf_svd(char *arg)
-{
-	struct supertype *st;
-	if (strcmp(arg, "ddf/svd") != 0 &&
-	    strcmp(arg, "svd") != 0 &&
-	    strcmp(arg, "default") != 0
-		)
-		return NULL;
-
-	st = malloc(sizeof(*st));
-	memset(st, 0, sizeof(*st));
-	st->ss = &super_ddf_svd;
-	st->max_devs = 512;
-	st->minor_version = 0;
-	st->sb = NULL;
-	return st;
-}
 
 #ifndef MDASSEMBLE
 
@@ -1206,29 +1178,33 @@ static void uuid_from_super_ddf(struct supertype *st, int uuid[4])
 	 * The first 16 bytes of the sha1 of these is used.
 	 */
 	struct ddf_super *ddf = st->sb;
-	struct vd_config *vd = &ddf->newconf->conf;
+	struct vcl *vcl = ddf->currentconf;
 
-	if (!vd)
+	if (!vcl)
 		memset(uuid, 0, sizeof (uuid));
 	else {
 		char buf[20];
 		struct sha1_ctx ctx;
 		sha1_init_ctx(&ctx);
-		sha1_process_bytes(&vd->guid, DDF_GUID_LEN, &ctx);
-		if (vd->sec_elmnt_count > 1)
-			sha1_process_bytes(&vd->sec_elmnt_seq, 1, &ctx);
+		sha1_process_bytes(&vcl->conf.guid, DDF_GUID_LEN, &ctx);
+		if (vcl->conf.sec_elmnt_count > 1)
+			sha1_process_bytes(&vcl->conf.sec_elmnt_seq, 1, &ctx);
 		sha1_finish_ctx(&ctx, buf);
 		memcpy(uuid, buf, sizeof(uuid));
 	}
 }
 
+static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info);
+
 static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info)
 {
 	struct ddf_super *ddf = st->sb;
 
-	info->array.major_version = 1000;
-	info->array.minor_version = 0; /* FIXME use ddf->revision somehow */
-	info->array.patch_version = 0;
+	if (ddf->currentconf) {
+		getinfo_super_ddf_bvd(st, info);
+		return;
+	}
+
 	info->array.raid_disks    = __be16_to_cpu(ddf->phys->used_pdes);
 	info->array.level	  = LEVEL_CONTAINER;
 	info->array.layout	  = 0;
@@ -1238,20 +1214,24 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info)
 	info->array.utime	  = 0;
 	info->array.chunk_size	  = 0;
 
-//	info->data_offset	  = ???;
-//	info->component_size	  = ???;
 
 	info->disk.major = 0;
 	info->disk.minor = 0;
 	if (ddf->dlist) {
 		info->disk.number = __be32_to_cpu(ddf->dlist->disk.refnum);
 		info->disk.raid_disk = find_phys(ddf, ddf->dlist->disk.refnum);
+
+		info->data_offset = __be64_to_cpu(ddf->phys->
+					  entries[info->disk.raid_disk].
+					  config_size);
+		info->component_size = ddf->dlist->size - info->data_offset;
 	} else {
 		info->disk.number = -1;
 //		info->disk.raid_disk = find refnum in the table and use index;
 	}
 	info->disk.state = (1 << MD_DISK_SYNC);
 
+
 	info->reshape_active = 0;
 
 	strcpy(info->text_version, "ddf");
@@ -1261,39 +1241,33 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info)
 //	info->name[] ?? ;
 }
 
-static void getinfo_super_n_container(struct supertype *st, struct mdinfo *info)
-{
-	/* just need offset and size */
-	struct ddf_super *ddf = st->sb;
-	int n = info->disk.number;
-
-	info->data_offset = __be64_to_cpu(ddf->phys->entries[n].config_size);
-	info->component_size = 32*1024*1024 / 512;
-}
-
 static int rlq_to_layout(int rlq, int prl, int raiddisks);
 
 static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info)
 {
 	struct ddf_super *ddf = st->sb;
-	struct vd_config *vd = find_vdcr(ddf, info->container_member);
+	struct vcl *vc = ddf->currentconf;
+	int cd = ddf->currentdev;
 
 	/* FIXME this returns BVD info - what if we want SVD ?? */
 
-	info->array.major_version = 1000;
-	info->array.minor_version = 0; /* FIXME use ddf->revision somehow */
-	info->array.patch_version = 0;
-	info->array.raid_disks    = __be16_to_cpu(vd->prim_elmnt_count);
-	info->array.level	  = map_num1(ddf_level_num, vd->prl);
-	info->array.layout	  = rlq_to_layout(vd->rlq, vd->prl,
+	info->array.raid_disks    = __be16_to_cpu(vc->conf.prim_elmnt_count);
+	info->array.level	  = map_num1(ddf_level_num, vc->conf.prl);
+	info->array.layout	  = rlq_to_layout(vc->conf.rlq, vc->conf.prl,
 						  info->array.raid_disks);
 	info->array.md_minor	  = -1;
-	info->array.ctime	  = DECADE + __be32_to_cpu(*(__u32*)(vd->guid+16));
-	info->array.utime	  = DECADE + __be32_to_cpu(vd->timestamp);
-	info->array.chunk_size	  = 512 << vd->chunk_shift;
-
-//	info->data_offset	  = ???;
-//	info->component_size	  = ???;
+	info->array.ctime	  = DECADE +
+		__be32_to_cpu(*(__u32*)(vc->conf.guid+16));
+	info->array.utime	  = DECADE + __be32_to_cpu(vc->conf.timestamp);
+	info->array.chunk_size	  = 512 << vc->conf.chunk_shift;
+
+	if (cd >= 0 && cd < ddf->mppe) {
+		info->data_offset	  = __be64_to_cpu(vc->lba_offset[cd]);
+		if (vc->block_sizes)
+			info->component_size = vc->block_sizes[cd];
+		else
+			info->component_size = __be64_to_cpu(vc->conf.blocks);
+	}
 
 	info->disk.major = 0;
 	info->disk.minor = 0;
@@ -1318,17 +1292,6 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info)
 //	info->name[] ?? ;
 }
 
-static void getinfo_super_n_bvd(struct supertype *st, struct mdinfo *info)
-{
-	/* Find the particular details for info->disk.raid_disk.
-	 * This includes data_offset, component_size,
-	 */
-	struct ddf_super *ddf = st->sb;
-	__u64 *lba_offset = ddf->newconf->lba_offset;
-	struct vd_config *conf = &ddf->newconf->conf;
-	info->data_offset = __be64_to_cpu(lba_offset[info->disk.raid_disk]);
-	info->component_size = __be64_to_cpu(conf->blocks);
-}
 
 static int update_super_ddf(struct supertype *st, struct mdinfo *info,
 			    char *update,
@@ -1425,6 +1388,12 @@ static void make_header_guid(char *guid)
 	if (rfd >= 0) close(rfd);
 }
 
+static int init_super_ddf_bvd(struct supertype *st,
+			      mdu_array_info_t *info,
+			      unsigned long long size,
+			      char *name, char *homehost,
+			      int *uuid);
+
 static int init_super_ddf(struct supertype *st,
 			  mdu_array_info_t *info,
 			  unsigned long long size, char *name, char *homehost,
@@ -1464,6 +1433,14 @@ static int init_super_ddf(struct supertype *st,
 	struct phys_disk *pd;
 	struct virtual_disk *vd;
 
+	if (!info) {
+		st->sb = NULL;
+		return 0;
+	}
+	if (st->sb)
+		return init_super_ddf_bvd(st, info, size, name, homehost,
+					  uuid);
+
 	ddf = malloc(sizeof(*ddf));
 	memset(ddf, 0, sizeof(*ddf));
 	ddf->dlist = NULL; /* no physical disks yet */
@@ -1721,7 +1698,7 @@ static int rlq_to_layout(int rlq, int prl, int raiddisks)
 struct extent {
 	unsigned long long start, size;
 };
-int cmp_extent(const void *av, const void *bv)
+static int cmp_extent(const void *av, const void *bv)
 {
 	const struct extent *a = av;
 	const struct extent *b = bv;
@@ -1732,7 +1709,7 @@ int cmp_extent(const void *av, const void *bv)
 	return 0;
 }
 
-struct extent *get_extents(struct ddf_super *ddf, struct dl *dl)
+static struct extent *get_extents(struct ddf_super *ddf, struct dl *dl)
 {
 	/* find a list of used extents on the give physical device
 	 * (dnum) of the given ddf.
@@ -1874,7 +1851,7 @@ static int init_super_ddf_bvd(struct supertype *st,
 
 	vcl->next = ddf->conflist;
 	ddf->conflist = vcl;
-	ddf->newconf = vcl;
+	ddf->currentconf = vcl;
 	return 1;
 }
 
@@ -1904,8 +1881,8 @@ static void add_to_super_ddf_bvd(struct supertype *st,
 	if (!dl || ! (dk->state & (1<<MD_DISK_SYNC)))
 		return;
 
-	vc = &ddf->newconf->conf;
-	lba_offset = ddf->newconf->lba_offset;
+	vc = &ddf->currentconf->conf;
+	lba_offset = ddf->currentconf->lba_offset;
 
 	ex = get_extents(ddf, dl);
 	if (!ex)
@@ -1913,8 +1890,8 @@ static void add_to_super_ddf_bvd(struct supertype *st,
 
 	i = 0; pos = 0;
 	blocks = __be64_to_cpu(vc->blocks);
-	if (ddf->newconf->block_sizes)
-		blocks = ddf->newconf->block_sizes[dk->raid_disk];
+	if (ddf->currentconf->block_sizes)
+		blocks = ddf->currentconf->block_sizes[dk->raid_disk];
 
 	do {
 		esize = ex[i].start - pos;
@@ -1928,6 +1905,7 @@ static void add_to_super_ddf_bvd(struct supertype *st,
 	if (esize < blocks)
 		return;
 
+	ddf->currentdev = dk->raid_disk;
 	vc->phys_refnum[dk->raid_disk] = dl->disk.refnum;
 	lba_offset[dk->raid_disk] = __cpu_to_be64(pos);
 
@@ -1936,7 +1914,7 @@ static void add_to_super_ddf_bvd(struct supertype *st,
 			break;
 	if (i == ddf->max_part)
 		return;
-	dl->vlist[i] = ddf->newconf;
+	dl->vlist[i] = ddf->currentconf;
 
 	dl->fd = fd;
 	dl->devname = devname;
@@ -1951,7 +1929,7 @@ static void add_to_super_ddf_bvd(struct supertype *st,
 			working++;
 
 	/* Find which virtual_entry */
-	i = ddf->newconf->vcnum;
+	i = ddf->currentconf->vcnum;
 	if (working == __be16_to_cpu(vc->prim_elmnt_count))
 		ddf->virt->entries[i].state =
 			(ddf->virt->entries[i].state & ~DDF_state_mask)
@@ -1982,6 +1960,11 @@ static void add_to_super_ddf(struct supertype *st,
 	int n, i;
 	struct stat stb;
 
+	if (ddf->currentconf) {
+		add_to_super_ddf_bvd(st, dk, fd, devname);
+		return;
+	}
+
 	/* This is device numbered dk->number.  We need to create
 	 * a phys_disk entry and a more detailed disk_data entry.
 	 */
@@ -2036,6 +2019,7 @@ static void add_to_super_ddf(struct supertype *st,
 	sprintf(pde->path, "%17.17s","Information: nil") ;
 	memset(pde->pad, 0xff, 6);
 
+	dd->size = size >> 9;
 	ddf->dlist = dd;
 }
 
@@ -2138,7 +2122,32 @@ static int __write_init_super_ddf(struct supertype *st, int do_close)
 
 static int write_init_super_ddf(struct supertype *st)
 {
-	return __write_init_super_ddf(st, 1);
+
+	if (st->update_tail) {
+		/* queue the virtual_disk and vd_config as metadata updates */
+		struct virtual_disk *vd;
+		struct vd_config *vc;
+		struct ddf_super *ddf = st->sb;
+		int len;
+
+		/* First the virtual disk.  We have a slightly fake header */
+		len = sizeof(struct virtual_disk) + sizeof(struct virtual_entry);
+		vd = malloc(len);
+		*vd = *ddf->virt;
+		vd->entries[0] = ddf->virt->entries[ddf->currentconf->vcnum];
+		vd->populated_vdes = __cpu_to_be16(ddf->currentconf->vcnum);
+		append_metadata_update(st, vd, len);
+
+		/* Then the vd_config */
+		len = ddf->conf_rec_len * 512;
+		vc = malloc(len);
+		memcpy(vc, &ddf->currentconf->conf, len);
+		append_metadata_update(st, vc, len);
+
+		/* FIXME I need to close the fds! */
+		return 0;
+	} else 
+		return __write_init_super_ddf(st, 1);
 }
 
 #endif
@@ -2152,7 +2161,17 @@ static __u64 avail_size_ddf(struct supertype *st, __u64 devsize)
 }
 
 #ifndef MDASSEMBLE
-int validate_geometry_ddf(struct supertype *st,
+static int validate_geometry_ddf_container(struct supertype *st,
+				    int level, int layout, int raiddisks,
+				    int chunk, unsigned long long size,
+				    char *dev, unsigned long long *freesize);
+
+static int validate_geometry_ddf_bvd(struct supertype *st,
+				     int level, int layout, int raiddisks,
+				     int chunk, unsigned long long size,
+				     char *dev, unsigned long long *freesize);
+
+static int validate_geometry_ddf(struct supertype *st,
 			  int level, int layout, int raiddisks,
 			  int chunk, unsigned long long size,
 			  char *dev, unsigned long long *freesize)
@@ -2169,53 +2188,50 @@ int validate_geometry_ddf(struct supertype *st,
 	 */
 
 	if (level == LEVEL_CONTAINER) {
-		st->ss = &super_ddf_container;
-		if (dev) {
-			int rv =st->ss->validate_geometry(st, level, layout,
-							  raiddisks, chunk,
-							  size,
-							  NULL, freesize);
-			if (rv)
-				return rv;
-		}
-		return st->ss->validate_geometry(st, level, layout, raiddisks,
-						 chunk, size, dev, freesize);
+		/* Must be a fresh device to add to a container */
+		return validate_geometry_ddf_container(st, level, layout,
+					       raiddisks,
+					       chunk, size, dev, freesize);
 	}
 
 	if (st->sb) {
-		/* creating in a given container */
-		st->ss = &super_ddf_bvd;
-		if (dev) {
-			int rv =st->ss->validate_geometry(st, level, layout,
-							  raiddisks, chunk,
-							  size,
-							  NULL, freesize);
-			if (rv)
-				return rv;
-		}
-		return st->ss->validate_geometry(st, level, layout, raiddisks,
+		/* A container has already been opened, so we are
+		 * creating in there.  Maybe a BVD, maybe an SVD.
+		 * Should make a distinction one day.
+		 */
+		return validate_geometry_ddf_bvd(st, level, layout, raiddisks,
 						 chunk, size, dev, freesize);
 	}
-	/* FIXME should exclude MULTIPATH, or more appropriately, allow
-	 * only known levels.
-	 */
-	if (!dev)
+	if (!dev) {
+		/* Initial sanity check.  Exclude illegal levels. */
+		int i;
+		for (i=0; ddf_level_num[i].num1 != MAXINT; i++)
+			if (ddf_level_num[i].num2 == level)
+				break;
+		if (ddf_level_num[i].num1 == MAXINT)
+			return 0;
+		/* Should check layout? etc */
 		return 1;
+	}
 
-	/* This device needs to be either a device in a 'ddf' container,
-	 * or it needs to be a 'ddf-bvd' array.
+	/* This is the first device for the array.
+	 * If it is a container, we read it in and do automagic allocations,
+	 * no other devices should be given.
+	 * Otherwise it must be a member device of a container, and we
+	 * do manual allocation.
+	 * Later we should check for a BVD and make an SVD.
 	 */
-
 	fd = open(dev, O_RDONLY|O_EXCL, 0);
 	if (fd >= 0) {
 		sra = sysfs_read(fd, 0, GET_VERSION);
 		close(fd);
 		if (sra && sra->array.major_version == -1 &&
-		    strcmp(sra->text_version, "ddf-bvd") == 0) {
-			st->ss = &super_ddf_svd;
-			return st->ss->validate_geometry(st, level, layout,
-							 raiddisks, chunk, size,
-							 dev, freesize);
+		    strcmp(sra->text_version, "ddf") == 0) {
+
+			/* load super */
+			/* find space for 'n' devices. */
+			/* remember the devices */
+			/* Somehow return the fact that we have enough */
 		}
 
 		fprintf(stderr,
@@ -2244,12 +2260,11 @@ int validate_geometry_ddf(struct supertype *st,
 		 * and try to create a bvd
 		 */
 		struct ddf_super *ddf;
-		st->ss = &super_ddf_bvd;
 		if (load_super_ddf_all(st, cfd, (void **)&ddf, NULL, 1) == 0) {
 			st->sb = ddf;
 			st->container_dev = fd2devnum(cfd);
 			close(cfd);
-			return st->ss->validate_geometry(st, level, layout,
+			return validate_geometry_ddf_bvd(st, level, layout,
 							 raiddisks, chunk, size,
 							 dev, freesize);
 		}
@@ -2260,10 +2275,10 @@ int validate_geometry_ddf(struct supertype *st,
 	return 1;
 }
 
-int validate_geometry_ddf_container(struct supertype *st,
-				    int level, int layout, int raiddisks,
-				    int chunk, unsigned long long size,
-				    char *dev, unsigned long long *freesize)
+static int validate_geometry_ddf_container(struct supertype *st,
+				   int level, int layout, int raiddisks,
+				   int chunk, unsigned long long size,
+				   char *dev, unsigned long long *freesize)
 {
 	int fd;
 	unsigned long long ldsize;
@@ -2290,10 +2305,10 @@ int validate_geometry_ddf_container(struct supertype *st,
 	return 1;
 }
 
-int validate_geometry_ddf_bvd(struct supertype *st,
-			      int level, int layout, int raiddisks,
-			      int chunk, unsigned long long size,
-			      char *dev, unsigned long long *freesize)
+static int validate_geometry_ddf_bvd(struct supertype *st,
+				     int level, int layout, int raiddisks,
+				     int chunk, unsigned long long size,
+				     char *dev, unsigned long long *freesize)
 {
 	struct stat stb;
 	struct ddf_super *ddf = st->sb;
@@ -2377,19 +2392,6 @@ int validate_geometry_ddf_bvd(struct supertype *st,
 	return 1;
 }
 
-int validate_geometry_ddf_svd(struct supertype *st,
-			      int level, int layout, int raiddisks,
-			      int chunk, unsigned long long size,
-			      char *dev, unsigned long long *freesize)
-{
-	/* dd/svd only supports striped, mirrored, concat, spanned... */
-	if (level != LEVEL_LINEAR &&
-	    level != 0 &&
-	    level != 1)
-		return 0;
-	return 1;
-}
-
 static int load_super_ddf_all(struct supertype *st, int fd,
 			      void **sbp, char *devname, int keep_fd)
 {
@@ -2457,13 +2459,13 @@ static int load_super_ddf_all(struct supertype *st, int fd,
 
 		for (v = super->conflist; v; v = v->next)
 			if (v->vcnum == atoi(st->subarray))
-				super->newconf = v;
-		if (!super->newconf)
+				super->currentconf = v;
+		if (!super->currentconf)
 			return 1;
 	}
 	*sbp = super;
 	if (st->ss == NULL) {
-		st->ss = &super_ddf_container;
+		st->ss = &super_ddf;
 		st->minor_version = 0;
 		st->max_devs = 512;
 		st->container_dev = fd2devnum(fd);
@@ -2495,9 +2497,6 @@ static struct mdinfo *container_content_ddf(struct supertype *st)
 		this->next = rest;
 		rest = this;
 
-		this->array.major_version = 1000;
-		this->array.minor_version = 0;
-		this->array.patch_version = 0;
 		this->array.level = map_num1(ddf_level_num, vc->conf.prl);
 		this->array.raid_disks =
 			__be16_to_cpu(vc->conf.prim_elmnt_count);
@@ -2568,15 +2567,6 @@ static struct mdinfo *container_content_ddf(struct supertype *st)
 	return rest;
 }
 
-static int init_zero_ddf(struct supertype *st,
-			 mdu_array_info_t *info,
-			 unsigned long long size, char *name,
-			 char *homehost, int *uuid)
-{
-	st->sb = NULL;
-	return 0;
-}
-
 static int store_zero_ddf(struct supertype *st, int fd)
 {
 	unsigned long long dsize;
@@ -2847,7 +2837,7 @@ static void ddf_process_update(struct supertype *st,
 		printf("len %d %d\n", update->len, ddf->conf_rec_len);
 
 		mppe = __be16_to_cpu(ddf->anchor.max_primary_element_entries);
-		if (update->len != ddf->conf_rec_len)
+		if (update->len != ddf->conf_rec_len * 512)
 			return;
 		vc = (struct vd_config*)update->buf;
 		for (vcl = ddf->conflist; vcl ; vcl = vcl->next)
@@ -2865,7 +2855,7 @@ static void ddf_process_update(struct supertype *st,
 			vcl = update->space;
 			update->space = NULL;
 			vcl->next = ddf->conflist;
-			vcl->conf = *vc;
+			memcpy(&vcl->conf, vc, update->len);
 			vcl->lba_offset = (__u64*)
 				&vcl->conf.phys_refnum[mppe];
 			ddf->conflist = vcl;
@@ -2911,6 +2901,20 @@ static void ddf_process_update(struct supertype *st,
 	}
 }
 
+static void 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;
+	__u32 *magic = (__u32*)update->buf;
+	if (*magic == DDF_VD_CONF_MAGIC)
+		update->space = malloc(offsetof(struct vcl, conf)
+				       + ddf->conf_rec_len * 512);
+}
+
 /*
  * Check if the array 'a' is degraded but not failed.
  * If it is, find as many spares as are available and needed and
@@ -3114,6 +3118,7 @@ struct superswitch super_ddf = {
 	.detail_super	= detail_super_ddf,
 	.brief_detail_super = brief_detail_super_ddf,
 	.validate_geometry = validate_geometry_ddf,
+	.write_init_super = write_init_super_ddf,
 #endif
 	.match_home	= match_home_ddf,
 	.uuid_from_super= uuid_from_super_ddf,
@@ -3125,13 +3130,13 @@ struct superswitch super_ddf = {
 	.compare_super	= compare_super_ddf,
 
 	.load_super	= load_super_ddf,
-	.init_super	= init_zero_ddf,
+	.init_super	= init_super_ddf,
 	.store_super	= store_zero_ddf,
 	.free_super	= free_super_ddf,
 	.match_metadata_desc = match_metadata_desc_ddf,
-	.getinfo_super_n  = getinfo_super_n_container,
+	.add_to_super	= add_to_super_ddf,
+	.container_content = container_content_ddf,
 
-	.swapuuid	= 0,
 	.external	= 1,
 
 /* for mdmon */
@@ -3140,67 +3145,7 @@ struct superswitch super_ddf = {
 	.set_disk       = ddf_set_disk,
 	.sync_metadata  = ddf_sync_metadata,
 	.process_update	= ddf_process_update,
+	.prepare_update	= ddf_prepare_update,
 	.activate_spare = ddf_activate_spare,
 
 };
-
-/* Super_ddf_container is set by validate_geometry_ddf when given a
- * device that is not part of any array
- */
-static struct superswitch super_ddf_container = {
-#ifndef MDASSEMBLE
-	.validate_geometry = validate_geometry_ddf_container,
-	.write_init_super = write_init_super_ddf,
-#endif
-
-	.load_super	= load_super_ddf,
-	.init_super	= init_super_ddf,
-	.add_to_super	= add_to_super_ddf,
-	.getinfo_super  = getinfo_super_ddf,
-
-	.free_super	= free_super_ddf,
-
-	.container_content = container_content_ddf,
-	.getinfo_super_n  = getinfo_super_n_container,
-
-	.swapuuid	= 0,
-	.external	= 1,
-};
-
-static struct superswitch super_ddf_bvd = {
-#ifndef	MDASSEMBLE
-//	.detail_super	= detail_super_ddf_bvd,
-//	.brief_detail_super = brief_detail_super_ddf_bvd,
-	.validate_geometry = validate_geometry_ddf_bvd,
-	.write_init_super = write_init_super_ddf,
-#endif
-	.update_super	= update_super_ddf,
-	.init_super	= init_super_ddf_bvd,
-	.add_to_super	= add_to_super_ddf_bvd,
-	.getinfo_super  = getinfo_super_ddf_bvd,
-	.getinfo_super_n  = getinfo_super_n_bvd,
-
-	.load_super	= load_super_ddf,
-	.free_super	= free_super_ddf,
-	.match_metadata_desc = match_metadata_desc_ddf_bvd,
-
-	.swapuuid	= 0,
-	.external	= 2,
-};
-
-static struct superswitch super_ddf_svd = {
-#ifndef	MDASSEMBLE
-//	.detail_super	= detail_super_ddf_svd,
-//	.brief_detail_super = brief_detail_super_ddf_svd,
-	.validate_geometry = validate_geometry_ddf_svd,
-#endif
-	.update_super	= update_super_ddf,
-	.init_super	= init_super_ddf,
-
-	.load_super	= load_super_ddf,
-	.free_super	= free_super_ddf,
-	.match_metadata_desc = match_metadata_desc_ddf_svd,
-
-	.swapuuid	= 0,
-	.external	= 2,
-};