mdassemble - fix new compile-time problems.

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

diff --git a/mdassemble.c b/mdassemble.c
index 181082916bfcbc4e5f379be8ef0a34258a9294c9..674be11f45e0ca3c527aaf4b9579dd2f84d6bf46 100644 (file)
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -48,7 +48,7 @@ int create_mddev(char *dev, char *name, int autof/*unused*/, int trustworthy,
        return open_mddev(dev, 0);
 }
 #endif
-int map_update(struct map_ent **mpp, int devnum, char *metadata,
+int map_update(struct map_ent **mpp, char *devnm, char *metadata,
               int *uuid, char *path)
 {
        return 0;
@@ -57,6 +57,9 @@ struct map_ent *map_by_name(struct map_ent **mpp, char *name)
 {
        return NULL;
 }
+int map_lock(struct map_ent **melp){return 0;}
+void map_unlock(struct map_ent **melp){}
+struct map_ent *map_by_uuid(struct map_ent **map, int uuid[4]){return NULL;}
 
 int rv;
 int mdfd = -1;

diff --git a/super1.c b/super1.c
index d0f1d5f089850751c4546d7278fe21a4499e7495..eb812757b0a13c29741f6b2fe37c3e34f95cea63 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -1012,12 +1012,13 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
                long bm_sectors = 0;
                long space;
 
+#ifndef MDASSEMBLE
                if (sb->feature_map & __cpu_to_le32(MD_FEATURE_BITMAP_OFFSET)) {
                        struct bitmap_super_s *bsb;
                        bsb = (struct bitmap_super_s *)(((char*)sb)+MAX_SB_SIZE);
                        bm_sectors = bitmap_sectors(bsb);
                }
-
+#endif
                if (sb_offset < data_offset) {
                        /* 1.1 or 1.2.  Put bbl just before data
                         */

diff --git a/util.c b/util.c
index a5eb8ed5c356814b3b765a04a95161011ffa6c26..7e2bbad14ed89a3035d0969eab6ad64d204b8612 100644 (file)
--- a/util.c
+++ b/util.c
@@ -777,7 +777,6 @@ int get_data_disks(int level, int layout, int raid_disks)
        return data_disks;
 }
 
-#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
 
 int devnm2devid(char *devnm)
 {
@@ -815,6 +814,7 @@ int devnm2devid(char *devnm)
        return 0;
 }
 
+#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
 char *get_md_name(char *devnm)
 {
        /* find /dev/md%d or /dev/md/%d or make a device /dev/.tmp.md%d */