FIX: resolve make everything compilation error

When mdadm is compiled using e.g. 'everything' option, mdasseble
compilation is broken.

Change code to enable mdasseble compilation

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

diff --git a/mdassemble.c b/mdassemble.c
index 66e480a82f71f9fc6e1b64fe87dc1aad58de680c..f5bc7464b07be8aea75db9cf83d0bee733e886f5 100644 (file)
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
                        rv |= Assemble(array_list->st, array_list->devname,
                                       array_list, NULL, NULL, 0,
                                       readonly, runstop, NULL, NULL, 0,
-                                      verbose, force);
+                                      verbose, force, 1);
                }
        return rv;
 }

diff --git a/super-intel.c b/super-intel.c
index 1960ebfc36af755c86314c9dd476ccd0a15dbfe6..21aa516b58d7617ea28a242e304c79f7bf5aa1c0 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -1039,12 +1039,12 @@ static unsigned long long min_acceptable_spare_size_imsm(struct supertype *st)
        return rv * 512;
 }
 
+static int is_gen_migration(struct imsm_dev *dev);
+
 #ifndef MDASSEMBLE
 static __u64 blocks_per_migr_unit(struct intel_super *super,
                                  struct imsm_dev *dev);
 
-static int is_gen_migration(struct imsm_dev *dev);
-
 static void print_imsm_dev(struct intel_super *super,
                           struct imsm_dev *dev,
                           char *uuid,
@@ -5680,6 +5680,7 @@ static int update_subarray_imsm(struct supertype *st, char *subarray,
 
        return 0;
 }
+#endif /* MDASSEMBLE */
 
 static int is_gen_migration(struct imsm_dev *dev)
 {
@@ -5694,7 +5695,6 @@ static int is_gen_migration(struct imsm_dev *dev)
 
        return 0;
 }
-#endif /* MDASSEMBLE */
 
 static int is_rebuilding(struct imsm_dev *dev)
 {