diff --git a/mdadm.h b/mdadm.h index 25bc623..109f6ef 100644 --- a/mdadm.h +++ b/mdadm.h @@ -711,7 +711,6 @@ struct supertype { int minor_version; int max_devs; int container_dev; /* devnum of container */ - char subarray[32]; /* name of array inside container */ void *sb; void *info; int loaded_container; /* Set if load_super found a container, diff --git a/mdmon.c b/mdmon.c index e416b2e..4936260 100644 --- a/mdmon.c +++ b/mdmon.c @@ -398,7 +398,6 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) container->devnum = devnum; container->devname = devname; container->arrays = NULL; - container->subarray[0] = 0; container->sock = -1; if (!container->devname) { diff --git a/super-ddf.c b/super-ddf.c index 01c376d..51d6929 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -1998,7 +1998,6 @@ static int init_super_ddf_bvd(struct supertype *st, } vcl->lba_offset = (__u64*) &vcl->conf.phys_refnum[ddf->mppe]; vcl->vcnum = venum; - sprintf(st->subarray, "%d", venum); vcl->block_sizes = NULL; /* FIXME not for CONCAT */ vc = &vcl->conf; diff --git a/super-intel.c b/super-intel.c index 5470c91..3443a2a 100644 --- a/super-intel.c +++ b/super-intel.c @@ -3075,7 +3075,6 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, if (!check_name(super, name, 0)) return 0; - sprintf(st->subarray, "%d", idx); dv = malloc(sizeof(*dv)); if (!dv) { fprintf(stderr, Name ": failed to allocate device list entry\n"); diff --git a/util.c b/util.c index 57b7e1f..f3c37e1 100644 --- a/util.c +++ b/util.c @@ -1086,7 +1086,6 @@ struct supertype *super_by_fd(int fd, char **subarrayp) sysfs_free(sra); if (st) { st->sb = NULL; - st->subarray[0] = 0; *subarrayp = subarray; } else free(subarray); @@ -1108,7 +1107,6 @@ struct supertype *dup_super(struct supertype *orig) st->ss = orig->ss; st->max_devs = orig->max_devs; st->minor_version = orig->minor_version; - strcpy(st->subarray, orig->subarray); st->sb = NULL; st->info = NULL; return st;