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 bab0397921a7d30dc24e012cfa9decc8d5e877f5..3cf2389a3ad523bfc9db1d25cafbff19eef901f8 100644 (file)
--- 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 03dd41c61666cb67eabafff07db21e0beb681412..6aa7fc6e526bdaef1782328cd7f541748e80ca66 100644 (file)
--- 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 47be2bba21fabaac7a617f8b4f0264f7fcd966a3..580e87c568edd4e1443ebcdaa053bee152e3dc64 100644 (file)
--- 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;