summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2008-07-12 20:27:39 +1000
committerNeil Brown <neilb@suse.de>2008-07-12 20:27:39 +1000
commit0d481d3723398828c81963dcd58b1bf768e2c0c2 (patch)
tree5049802ad93400e8f797fbf2e9c6422d40110990
parentf7e7067b47d2ca9994f9222dfa5833ac84ce3b22 (diff)
downloadmdadm-0d481d3723398828c81963dcd58b1bf768e2c0c2.tar.gz
mdadm-0d481d3723398828c81963dcd58b1bf768e2c0c2.tar.xz
mdadm-0d481d3723398828c81963dcd58b1bf768e2c0c2.zip
External metadata shouldn't set array.*_version
It doesn't mean anything and is never used.
-rw-r--r--super-ddf.c9
-rw-r--r--super-intel.c11
2 files changed, 2 insertions, 18 deletions
diff --git a/super-ddf.c b/super-ddf.c
index 378a5d2..50fd16b 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -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);
diff --git a/super-intel.c b/super-intel.c
index 30b2962..eb963df 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -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);