From: NeilBrown <neilb@suse.de>
Date: Tue, 30 Nov 2010 07:35:36 +0000 (+1100)
Subject: mdmon: don't copy an invalid chunk_size
X-Git-Tag: mdadm-3.1.5~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515afde355330a2a7643e979418e4d586504650c;p=thirdparty%2Fmdadm.git

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>
---

diff --git a/managemon.c b/managemon.c
index bab03979..3cf2389a 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 03dd41c6..6aa7fc6e 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 47be2bba..580e87c5 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;