NeilBrown: Compile fixes for mdassemble
Martin F. Krafft
madduck at alioth.debian.org
Wed Jan 27 02:02:20 UTC 2010
Module: mdadm
Branch: master
Commit: eb3929a47f547f3890b2d5d3891941e96d7f73eb
URL: http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=eb3929a47f547f3890b2d5d3891941e96d7f73eb
Author: NeilBrown <neilb at suse.de>
Date: Tue Oct 20 16:53:43 2009 +1100
Compile fixes for mdassemble
Signed-off-by: NeilBrown <neilb at suse.de>
---
Assemble.c | 2 ++
util.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Assemble.c b/Assemble.c
index 8423a81..28de83e 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 f646bb9..662061b 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)
{
More information about the pkg-mdadm-commits
mailing list