Make sure "make everything" builds again.
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
02b70e83e6
commit
1e60caebbc
4
Grow.c
4
Grow.c
|
@ -940,7 +940,9 @@ int reshape_open_backup_file(char *backup_file,
|
||||||
|
|
||||||
if (!restart && strncmp(backup_file, MAP_DIR, strlen(MAP_DIR)) != 0) {
|
if (!restart && strncmp(backup_file, MAP_DIR, strlen(MAP_DIR)) != 0) {
|
||||||
char *bu = make_backup(sys_name);
|
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);
|
free(bu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
8
Makefile
8
Makefile
|
@ -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)
|
$(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)
|
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
|
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
|
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
|
# use '-z now' to guarantee no dynamic linker interactions with the monitor thread
|
||||||
mdmon : check_rundir $(MON_OBJS)
|
mdmon : check_rundir $(MON_OBJS)
|
||||||
|
@ -214,7 +214,7 @@ mdassemble.diet : $(ASSEMBLE_SRCS) $(INCL)
|
||||||
|
|
||||||
mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)
|
mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)
|
||||||
rm -f $(OBJS)
|
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)
|
mdassemble.auto : $(ASSEMBLE_SRCS) $(INCL) $(ASSEMBLE_AUTO_SRCS)
|
||||||
rm -f mdassemble.static
|
rm -f mdassemble.static
|
||||||
|
|
|
@ -1758,6 +1758,7 @@ static void detail_super_ddf(struct supertype *st, char *homehost)
|
||||||
printf(" Virtual Disks : %d\n", cnt);
|
printf(" Virtual Disks : %d\n", cnt);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static const char *vendors_with_variable_volume_UUID[] = {
|
static const char *vendors_with_variable_volume_UUID[] = {
|
||||||
"LSI ",
|
"LSI ",
|
||||||
|
@ -1804,6 +1805,7 @@ static void uuid_of_ddf_subarray(const struct ddf_super *ddf,
|
||||||
memcpy(uuid, sha, 4*4);
|
memcpy(uuid, sha, 4*4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef MDASSEMBLE
|
||||||
static void brief_detail_super_ddf(struct supertype *st)
|
static void brief_detail_super_ddf(struct supertype *st)
|
||||||
{
|
{
|
||||||
struct mdinfo info;
|
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 cd = ddf->currentdev;
|
||||||
int n_prim;
|
int n_prim;
|
||||||
int j;
|
int j;
|
||||||
struct dl *dl;
|
struct dl *dl = NULL;
|
||||||
int map_disks = info->array.raid_disks;
|
int map_disks = info->array.raid_disks;
|
||||||
__u32 *cptr;
|
__u32 *cptr;
|
||||||
struct vd_config *conf;
|
struct vd_config *conf;
|
||||||
|
|
Loading…
Reference in New Issue