From: NeilBrown <neilb@suse.de>
Date: Tue, 20 Oct 2009 05:53:43 +0000 (+1100)
Subject: Compile fixes for mdassemble
X-Git-Tag: mdadm-3.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb3929a47f547f3890b2d5d3891941e96d7f73eb;p=thirdparty%2Fmdadm.git

Compile fixes for mdassemble

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Assemble.c b/Assemble.c
index 8423a818..28de83e0 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1104,10 +1104,12 @@ int Assemble(struct supertype *st, char *mddev,
 			 * it read-only and let the grow code make it writable.
 			 */
 			int rv;
+#ifndef MDASSEMBLE
 			if (content->reshape_active &&
 			    content->delta_disks <= 0)
 				rv = Grow_continue(mdfd, st, content, backup_file);
 			else
+#endif
 				rv = ioctl(mdfd, RUN_ARRAY, NULL);
 			if (rv == 0) {
 				if (verbose >= 0) {
diff --git a/util.c b/util.c
index f646bb92..662061b0 100644
--- a/util.c
+++ b/util.c
@@ -149,6 +149,7 @@ int get_linux_version()
 	return (a*1000000)+(b*1000)+c;
 }
 
+#ifndef MDASSEMBLE
 long long parse_size(char *size)
 {
 	/* parse 'size' which should be a number optionally
@@ -213,6 +214,7 @@ int parse_layout_faulty(char *layout)
 
 	return mode | (atoi(layout+ln)<< ModeShift);
 }
+#endif
 
 void remove_partitions(int fd)
 {