diff options
author | NeilBrown <neilb@suse.de> | 2008-09-18 15:04:47 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2008-09-18 15:04:47 +1000 |
commit | 0e6004268370082b3af89e73c356f4ada5ca31c2 (patch) | |
tree | 4978df58685357fbddf55594a21315e5953aa342 /util.c | |
parent | 1cccd683f3a77f269ae8183277e9da8ee1c2d7b7 (diff) | |
download | mdadm-0e6004268370082b3af89e73c356f4ada5ca31c2.tar.gz mdadm-0e6004268370082b3af89e73c356f4ada5ca31c2.tar.xz mdadm-0e6004268370082b3af89e73c356f4ada5ca31c2.zip |
Compile fixes, particularly moving more stuff under MDASSEMBLE
Now 'make everything' works again.
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -633,7 +633,6 @@ unsigned long long calc_array_size(int level, int raid_disks, int layout, return data_disks * devsize; } -#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO) int get_mdp_major(void) { static int mdp_major = -1; @@ -662,8 +661,7 @@ static int mdp_major = -1; return mdp_major; } - - +#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO) char *get_md_name(int dev) { /* find /dev/md%d or /dev/md/%d or make a device /dev/.tmp.md%d */ @@ -1145,7 +1143,7 @@ int env_no_mdmon(void) return 0; } - +#ifndef MDASSEMBLE int flush_metadata_updates(struct supertype *st) { int sfd; @@ -1186,7 +1184,7 @@ void append_metadata_update(struct supertype *st, void *buf, int len) *st->update_tail = mu; st->update_tail = &mu->next; } - +#endif /* MDASSEMBLE */ #ifdef __TINYC__ /* tinyc doesn't optimize this check in ioctl.h out ... */ |