Remove subarray field in supertype.

This is now only ever set, never used.
So remove it.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/mdadm.h b/mdadm.h
index 25bc6230eadf8273af0da36bc69bc5ab7e30eae8..109f6efe233e4e4b609638c5ea6c35a013adcf34 100644 (file)
--- 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 e416b2e42f4559c69b896252f6d4cb4f8efa4447..4936260615a06193f0930a011d1f75835886e894 100644 (file)
--- 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 01c376d6c6b270512e418f7681dc7a2def4c08a8..51d6929c084e30fb80b6439cecd6af93b0cb8599 100644 (file)
--- 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 5470c91d3648061310f23a56adf8668d77dc5a96..3443a2aa909132a4416ac1e99578efff83b729ff 100644 (file)
--- 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 57b7e1f57d91a71294d489e05fce40d602e14793..f3c37e1003b26e157cf7573d7389709c82a473c8 100644 (file)
--- 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;