diff options
| author | NeilBrown <neilb@suse.de> | 2014-06-05 16:38:29 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2014-06-05 16:38:29 +1000 |
| commit | 1e60caebbcebd3375b8bc5dc2ef244983620e4d0 (patch) | |
| tree | ec8762670fd303b7a3c7bd2a11979c83f2144a81 | |
| parent | 02b70e83e6367c3337de288320cf4b0edf51ad0e (diff) | |
Make sure "make everything" builds again.
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | Grow.c | 4 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | super-ddf.c | 4 |
3 files changed, 10 insertions, 6 deletions
@@ -940,7 +940,9 @@ int reshape_open_backup_file(char *backup_file, if (!restart && strncmp(backup_file, MAP_DIR, strlen(MAP_DIR)) != 0) { char *bu = make_backup(sys_name); - symlink(backup_file, bu); + if (symlink(backup_file, bu)) + pr_err("Recording backup file in " MAP_DIR "failed: %s\n", + strerror(errno)); free(bu); } @@ -186,13 +186,13 @@ mdadm.klibc : $(SRCS) $(INCL) $(CC) -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 $(CFLAGS) $(SRCS) mdadm.Os : $(SRCS) $(INCL) - $(CC) -o mdadm.Os $(CFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -Os $(SRCS) + $(CC) -o mdadm.Os $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -Os $(SRCS) mdadm.O2 : $(SRCS) $(INCL) mdmon.O2 - $(CC) -o mdadm.O2 $(CFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(SRCS) + $(CC) -o mdadm.O2 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(SRCS) mdmon.O2 : $(MON_SRCS) $(INCL) mdmon.h - $(CC) -o mdmon.O2 $(CFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(MON_SRCS) + $(CC) -o mdmon.O2 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(MON_SRCS) # use '-z now' to guarantee no dynamic linker interactions with the monitor thread mdmon : check_rundir $(MON_OBJS) @@ -214,7 +214,7 @@ mdassemble.diet : $(ASSEMBLE_SRCS) $(INCL) mdassemble.static : $(ASSEMBLE_SRCS) $(INCL) rm -f $(OBJS) - $(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC) + $(CC) $(LDFLAGS) $(CPPFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC) mdassemble.auto : $(ASSEMBLE_SRCS) $(INCL) $(ASSEMBLE_AUTO_SRCS) rm -f mdassemble.static diff --git a/super-ddf.c b/super-ddf.c index 8c8e886c..ab9fc46f 100644 --- a/super-ddf.c +++ b/super-ddf.c @@ -1758,6 +1758,7 @@ static void detail_super_ddf(struct supertype *st, char *homehost) printf(" Virtual Disks : %d\n", cnt); printf("\n"); } +#endif static const char *vendors_with_variable_volume_UUID[] = { "LSI ", @@ -1804,6 +1805,7 @@ static void uuid_of_ddf_subarray(const struct ddf_super *ddf, memcpy(uuid, sha, 4*4); } +#ifndef MDASSEMBLE static void brief_detail_super_ddf(struct supertype *st) { struct mdinfo info; @@ -2074,7 +2076,7 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha int cd = ddf->currentdev; int n_prim; int j; - struct dl *dl; + struct dl *dl = NULL; int map_disks = info->array.raid_disks; __u32 *cptr; struct vd_config *conf; |