FIX: resolve make everything compilation error
When mdadm is compiled using e.g. 'everything' option, mdasseble compilation is broken. Change code to enable mdasseble compilation Signed-off-by: Adam Kwolek <adam.kwolek@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
bf4442aba4
commit
d1e02575f5
|
@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
|
||||||
rv |= Assemble(array_list->st, array_list->devname,
|
rv |= Assemble(array_list->st, array_list->devname,
|
||||||
array_list, NULL, NULL, 0,
|
array_list, NULL, NULL, 0,
|
||||||
readonly, runstop, NULL, NULL, 0,
|
readonly, runstop, NULL, NULL, 0,
|
||||||
verbose, force);
|
verbose, force, 1);
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1039,12 +1039,12 @@ static unsigned long long min_acceptable_spare_size_imsm(struct supertype *st)
|
||||||
return rv * 512;
|
return rv * 512;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int is_gen_migration(struct imsm_dev *dev);
|
||||||
|
|
||||||
#ifndef MDASSEMBLE
|
#ifndef MDASSEMBLE
|
||||||
static __u64 blocks_per_migr_unit(struct intel_super *super,
|
static __u64 blocks_per_migr_unit(struct intel_super *super,
|
||||||
struct imsm_dev *dev);
|
struct imsm_dev *dev);
|
||||||
|
|
||||||
static int is_gen_migration(struct imsm_dev *dev);
|
|
||||||
|
|
||||||
static void print_imsm_dev(struct intel_super *super,
|
static void print_imsm_dev(struct intel_super *super,
|
||||||
struct imsm_dev *dev,
|
struct imsm_dev *dev,
|
||||||
char *uuid,
|
char *uuid,
|
||||||
|
@ -5680,6 +5680,7 @@ static int update_subarray_imsm(struct supertype *st, char *subarray,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif /* MDASSEMBLE */
|
||||||
|
|
||||||
static int is_gen_migration(struct imsm_dev *dev)
|
static int is_gen_migration(struct imsm_dev *dev)
|
||||||
{
|
{
|
||||||
|
@ -5694,7 +5695,6 @@ static int is_gen_migration(struct imsm_dev *dev)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif /* MDASSEMBLE */
|
|
||||||
|
|
||||||
static int is_rebuilding(struct imsm_dev *dev)
|
static int is_rebuilding(struct imsm_dev *dev)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue