]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
External metadata shouldn't set array.*_version
authorNeil Brown <neilb@suse.de>
Sat, 12 Jul 2008 10:27:39 +0000 (20:27 +1000)
committerNeil Brown <neilb@suse.de>
Sat, 12 Jul 2008 10:27:39 +0000 (20:27 +1000)
It doesn't mean anything and is never used.

super-ddf.c
super-intel.c

index 378a5d2b4c75995e14127d2a4cf2b866466a712e..50fd16b4562f0ea25d2f72d3c9e142d01cd8a446 100644 (file)
@@ -1226,9 +1226,6 @@ 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;
        info->array.raid_disks    = __be16_to_cpu(ddf->phys->used_pdes);
        info->array.level         = LEVEL_CONTAINER;
        info->array.layout        = 0;
@@ -1280,9 +1277,6 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info)
 
        /* 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,
@@ -2495,9 +2489,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);
index 30b2962688a70aeca5144927914af63fabe32e80..eb963df3503815f558c14c304489301395e1f5d2 100644 (file)
@@ -451,6 +451,7 @@ static void uuid_from_super_imsm(struct supertype *st, int uuid[4])
        printf("%s\n", __FUNCTION__);
 }
 
+#if 0
 static void
 get_imsm_numerical_version(struct imsm_super *mpb, int *m, int *p)
 {
@@ -476,6 +477,7 @@ get_imsm_numerical_version(struct imsm_super *mpb, int *m, int *p)
        *m = strtol(minor, NULL, 0);
        *p = strtol(patch, NULL, 0);
 }
+#endif
 
 static int imsm_level_to_layout(int level)
 {
@@ -499,9 +501,6 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
        struct imsm_disk *disk;
        __u32 s;
 
-       info->array.major_version = 2000;
-       get_imsm_numerical_version(mpb, &info->array.minor_version,
-                                  &info->array.patch_version);
        info->array.raid_disks    = mpb->num_disks;
        info->array.level         = LEVEL_CONTAINER;
        info->array.layout        = 0;
@@ -536,9 +535,6 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info)
        struct imsm_dev *dev = get_imsm_dev(mpb, info->container_member);
        struct imsm_map *map = &dev->vol.map[0];
 
-       info->array.major_version = 2000;
-       get_imsm_numerical_version(mpb, &info->array.minor_version,
-                                  &info->array.patch_version);
        info->array.raid_disks    = map->num_members;
        info->array.level         = get_imsm_raid_level(map);
        info->array.layout        = imsm_level_to_layout(info->array.level);
@@ -1572,9 +1568,6 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
                this->next = rest;
                rest = this;
 
-               this->array.major_version = 2000;
-               get_imsm_numerical_version(mpb, &this->array.minor_version,
-                                          &this->array.patch_version);
                this->array.level = get_imsm_raid_level(map);
                this->array.raid_disks = map->num_members;
                this->array.layout = imsm_level_to_layout(this->array.level);