diff options
| author | Neil Brown <neilb@suse.de> | 2005-06-14 06:49:05 +0000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2005-06-14 06:49:05 +0000 |
| commit | c7654afc29a0f4a7920f134ccc968548b8d0a598 (patch) | |
| tree | aef70667b3f5fec7db9527970dd168c1140c3a6f | |
| parent | fe6729fa8cde33bce8d693e3f082fae688b1ff09 (diff) | |
| download | mdadm-c7654afc29a0f4a7920f134ccc968548b8d0a598.tar.gz mdadm-c7654afc29a0f4a7920f134ccc968548b8d0a598.tar.xz mdadm-c7654afc29a0f4a7920f134ccc968548b8d0a598.zip | |
Fix compiling of mdassemble
(again).
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | super0.c | 5 | ||||
| -rw-r--r-- | super1.c | 6 |
3 files changed, 11 insertions, 3 deletions
@@ -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 @@ -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, @@ -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, |