summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-11-30 18:35:36 +1100
committerNeilBrown <neilb@suse.de>2011-03-10 17:21:03 +1100
commit515afde355330a2a7643e979418e4d586504650c (patch)
tree36b6aa5fea8ec7da8ced62de772df60c8b58ae3d
parent002a3de3d4a05692e9951cc3aba9fec5fb937623 (diff)
downloadmdadm-515afde355330a2a7643e979418e4d586504650c.tar.gz
mdmon: don't copy an invalid chunk_size
As chunk_size in mdstat_ent is never set, we shouldn't copy it into a->info.array. In fact, it is safest to get rid of the field altogether. Reported-by: "Kwolek, Adam" <adam.kwolek@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--managemon.c1
-rw-r--r--mdadm.h1
-rw-r--r--mdstat.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/managemon.c b/managemon.c
index bab0397..3cf2389 100644
--- a/managemon.c
+++ b/managemon.c
@@ -396,7 +396,6 @@ static void manage_member(struct mdstat_ent *mdstat,
*/
// FIXME
a->info.array.raid_disks = mdstat->raid_disks;
- a->info.array.chunk_size = mdstat->chunk_size;
// MORE
if (a->check_degraded) {
diff --git a/mdadm.h b/mdadm.h
index 03dd41c..6aa7fc6 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -358,7 +358,6 @@ struct mdstat_ent {
int resync; /* 1 if resync, 0 if recovery */
int devcnt;
int raid_disks;
- int chunk_size;
char * metadata_version;
struct dev_member {
char *name;
diff --git a/mdstat.c b/mdstat.c
index 47be2bb..580e87c 100644
--- a/mdstat.c
+++ b/mdstat.c
@@ -185,7 +185,6 @@ struct mdstat_ent *mdstat_read(int hold, int start)
ent->resync = 0;
ent->metadata_version = NULL;
ent->raid_disks = 0;
- ent->chunk_size = 0;
ent->devcnt = 0;
ent->members = NULL;