diff options
| author | NeilBrown <neilb@suse.com> | 2015-08-03 11:54:16 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-08-03 15:42:31 +1000 |
| commit | 187f157bf0b6903a1c72d969550af2dc4fb4fe9b (patch) | |
| tree | d61a035e2214c8857c4134c2d0ecbd1f60b775b7 | |
| parent | 7eee461e91df702d8f588955b03e5bbb07e1f88d (diff) | |
| download | mdadm-187f157bf0b6903a1c72d969550af2dc4fb4fe9b.tar.gz | |
mdassemble: include mapfile support.
This does make mdassemble a bit bigger, but it also means
it actually works properly with named arrays.
Ref: https://bbs.archlinux.org/viewtopic.php?id=198196
Signed-off-by: NeilBrown <neilb@suse.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mdadm.h | 10 | ||||
| -rw-r--r-- | mdassemble.c | 12 |
3 files changed, 1 insertions, 23 deletions
@@ -145,7 +145,7 @@ STATICOBJS = pwgr.o ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c policy.c dlink.c util.c \ maps.c lib.c xmalloc.c \ super0.c super1.c super-ddf.c super-intel.c sha1.c crc32.c sg_io.c mdstat.c \ - platform-intel.c probe_roms.c sysfs.c super-mbr.c super-gpt.c + platform-intel.c probe_roms.c sysfs.c super-mbr.c super-gpt.c mapfile.c ASSEMBLE_AUTO_SRCS := mdopen.c ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE ifdef MDASSEMBLE_AUTO @@ -490,18 +490,8 @@ extern int map_update(struct map_ent **mpp, char *devnm, char *metadata, int uuid[4], char *path); extern void map_remove(struct map_ent **map, char *devnm); extern struct map_ent *map_by_uuid(struct map_ent **map, int uuid[4]); -#ifdef MDASSEMBLE -static inline struct map_ent *map_by_devnm(struct map_ent **map, char *name) -{ - return NULL; -} -static inline void map_free(struct map_ent *map) -{ -} -#else extern struct map_ent *map_by_devnm(struct map_ent **map, char *devnm); extern void map_free(struct map_ent *map); -#endif extern struct map_ent *map_by_name(struct map_ent **map, char *name); extern void map_read(struct map_ent **melp); extern int map_write(struct map_ent *mel); diff --git a/mdassemble.c b/mdassemble.c index 667b247..78d363a 100644 --- a/mdassemble.c +++ b/mdassemble.c @@ -50,18 +50,6 @@ 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, char *devnm, char *metadata, - int *uuid, char *path) -{ - return 0; -} -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; |