diff options
| author | Neil Brown <neilb@suse.de> | 2008-05-27 09:18:56 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-05-27 09:18:56 +1000 |
| commit | dd15dc4a4d56d0b9ed29b558fb86a8945a18bc5c (patch) | |
| tree | 44e1e6831b36d092ae3676e81694c9db8226eee5 /super-ddf.c | |
| parent | 159c3a1a7785693d21f5226182f9c066882bef66 (diff) | |
| download | mdadm-dd15dc4a4d56d0b9ed29b558fb86a8945a18bc5c.tar.gz mdadm-dd15dc4a4d56d0b9ed29b558fb86a8945a18bc5c.tar.xz mdadm-dd15dc4a4d56d0b9ed29b558fb86a8945a18bc5c.zip | |
Discard st->container_member
'container_member' isn't really a well defined concept.
Each metadata might enumerate members differently, so just
let each format /mdX/YYYY as appropriate.
Diffstat (limited to 'super-ddf.c')
| -rw-r--r-- | super-ddf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/super-ddf.c b/super-ddf.c index fe76509..e8082b5 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -405,6 +405,7 @@ struct ddf_super { * the lba table */ struct vd_config conf; } *conflist, *newconf; + int conf_num; /* Index into 'virt' of entry matching 'newconf' */ struct dl { struct dl *next; struct disk_data disk; @@ -1162,7 +1163,7 @@ 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 = find_vdcr(ddf, st->container_member); + struct vd_config *vd = find_vdcr(ddf, ddf->conf_num); if (!vd) memset(uuid, 0, sizeof (uuid)); @@ -1688,7 +1689,7 @@ static int init_super_ddf_bvd(struct supertype *st, return 0; } ve = &ddf->virt->entries[venum]; - st->container_member = venum; + ddf->conf_num = venum; /* A Virtual Disk GUID contains the T10 Vendor ID, controller type, * timestamp, random number @@ -2086,7 +2087,6 @@ int validate_geometry_ddf(struct supertype *st, if (load_super_ddf_all(st, cfd, (void **)&ddf, NULL, 1) == 0) { st->sb = ddf; st->container_dev = fd2devnum(cfd); - st->container_member = 27; // FIXME close(cfd); return st->ss->validate_geometry(st, level, layout, raiddisks, chunk, size, |