imsm: FIX: Correct make everything and variable initialization

make everything doesn't compile (again) due to not used function warning
and uninitialized variable.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/super-intel.c b/super-intel.c
index 1f641caff793a58ef0deac8bd336a8f3ff6e3916..6b31ce3f81b55461a067c59a612837f8f76190ac 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -1177,7 +1177,7 @@ void examine_migr_rec_imsm(struct intel_super *super)
        for (i = 0; i < mpb->num_raid_devs; i++) {
                struct imsm_dev *dev = __get_imsm_dev(mpb, i);
                struct imsm_map *map;
-               int slot;
+               int slot = -1;
 
                if (is_gen_migration(dev) == 0)
                                continue;
@@ -2130,7 +2130,7 @@ static int load_imsm_migr_rec(struct intel_super *super, struct mdinfo *info)
        int fd = -1;
        struct imsm_dev *dev;
        struct imsm_map *map = NULL;
-       int slot;
+       int slot = -1;
 
        /* find map under migration */
        dev = imsm_get_device_during_migration(super);
@@ -2267,7 +2267,7 @@ static int write_imsm_migr_rec(struct supertype *st)
        map = get_imsm_map(dev, MAP_0);
 
        for (sd = super->disks ; sd ; sd = sd->next) {
-               int slot;
+               int slot = -1;
 
                /* skip failed and spare devices */
                if (sd->index < 0)
@@ -2563,6 +2563,8 @@ static __u8 imsm_check_degraded(struct intel_super *super, struct imsm_dev *dev,
 static int imsm_count_failed(struct intel_super *super, struct imsm_dev *dev,
                             int look_in_map);
 
+
+#ifndef MDASSEMBLE
 static void manage_second_map(struct intel_super *super, struct imsm_dev *dev)
 {
        if (is_gen_migration(dev)) {
@@ -2578,6 +2580,7 @@ static void manage_second_map(struct intel_super *super, struct imsm_dev *dev)
                }
        }
 }
+#endif
 
 static struct imsm_disk *get_imsm_missing(struct intel_super *super, __u8 index)
 {
@@ -5796,6 +5799,7 @@ static int is_rebuilding(struct imsm_dev *dev)
                return 0;
 }
 
+#ifndef MDASSEMBLE
 static int is_initializing(struct imsm_dev *dev)
 {
        struct imsm_map *migr_map;
@@ -5812,8 +5816,8 @@ static int is_initializing(struct imsm_dev *dev)
                return 1;
 
        return 0;
-
 }
+#endif
 
 static void update_recovery_start(struct intel_super *super,
                                        struct imsm_dev *dev,