Fix compiling of mdassemble

(again).

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>

diff --git a/Makefile b/Makefile
index 77a4c2361406a361a423e0a2cdf346b1cfc04846..cd4051623666715e3ffb74e1947fa88f433711c7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,10 @@ SRCS =  mdadm.c config.c mdstat.c  ReadMe.c util.c Manage.c Assemble.c Build.c \
        mdopen.c super0.c super1.c bitmap.c
 
 ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c
+ASSEMBLE_FLAGS:= -DMDASSEMBLE
 ifdef MDASSEMBLE_AUTO
 ASSEMBLE_SRCS += mdopen.c mdstat.c
-ASSEMBLE_FLAGS = -DMDASSEMBLE_AUTO
+ASSEMBLE_FLAGS += -DMDASSEMBLE_AUTO
 endif
 
 all : mdadm mdadm.man md.man mdadm.conf.man

diff --git a/super0.c b/super0.c
index 303ed889b60c326ee780135179e4ef1ce786918e..ada598aa2ed35849837b1c11b3bdd3399d79c177 100644 (file)
--- a/super0.c
+++ b/super0.c
@@ -52,6 +52,7 @@ static unsigned long calc_sb0_csum(mdp_super_t *super)
        return newcsum;
 }
 
+#ifndef MDASSEMBLE
 static void examine_super0(void *sbv)
 {
        mdp_super_t *sb = sbv;
@@ -170,7 +171,7 @@ static void brief_detail_super0(void *sbv)
        else
                printf("%08x", sb->set_uuid0);
 }
-
+#endif
 static void uuid_from_super0(int uuid[4], void * sbv)
 {
        mdp_super_t *super = sbv;
@@ -743,10 +744,12 @@ int write_bitmap0(struct supertype *st, int fd, void *sbv)
        
 
 struct superswitch super0 = {
+#ifndef MDASSEMBLE
        .examine_super = examine_super0,
        .brief_examine_super = brief_examine_super0,
        .detail_super = detail_super0,
        .brief_detail_super = brief_detail_super0,
+#endif
        .uuid_from_super = uuid_from_super0,
        .getinfo_super = getinfo_super0,
        .update_super = update_super0,

diff --git a/super1.c b/super1.c
index 114ef83ed1a654a4e1edc8f179323838b32c7f1b..31cf9a378769b9584dccbed83fb2752976ae364d 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -115,7 +115,7 @@ static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb)
        return csum;
 }
 
-
+#ifndef MDASSEMBLE
 static void examine_super1(void *sbv)
 {
        struct mdp_superblock_1 *sb = sbv;
@@ -250,6 +250,8 @@ static void brief_detail_super1(void *sbv)
        }
 }
 
+#endif
+
 static void uuid_from_super1(int uuid[4], void * sbv)
 {
        struct mdp_superblock_1 *super = sbv;
@@ -783,10 +785,12 @@ static __u64 avail_size1(__u64 devsize)
 }
 
 struct superswitch super1 = {
+#ifndef MDASSEMBLE
        .examine_super = examine_super1,
        .brief_examine_super = brief_examine_super1,
        .detail_super = detail_super1,
        .brief_detail_super = brief_detail_super1,
+#endif
        .uuid_from_super = uuid_from_super1,
        .getinfo_super = getinfo_super1,
        .update_super = update_super1,