From 5a23a06ea472460ae3beddf9140923570268e3dd Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 13 May 2013 17:05:16 +1000 Subject: [PATCH] mdassemble - fix new compile-time problems. Signed-off-by: NeilBrown --- mdassemble.c | 5 ++++- super1.c | 3 ++- util.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mdassemble.c b/mdassemble.c index 18108291..674be11f 100644 --- 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 d0f1d5f0..eb812757 100644 --- 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 a5eb8ed5..7e2bbad1 100644 --- 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 */ -- 2.39.2