From: Adam Kwolek <adam.kwolek@intel.com>
Date: Tue, 6 Dec 2011 00:44:46 +0000 (+1100)
Subject: FIX: resolve make everything compilation error
X-Git-Tag: mdadm-3.2.3~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e02575f579abcb50c967c5126f07a60d4642bc;p=thirdparty%2Fmdadm.git

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 66e480a8..f5bc7464 100644
--- 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 1960ebfc..21aa516b 100644
--- 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)
 {