load_super should not try to load_container
Now that load_container is a separate operation, load_super should not try it first. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
de697acc4c
commit
4a011f1009
|
@ -772,12 +772,6 @@ static int load_super_ddf(struct supertype *st, int fd,
|
||||||
struct ddf_super *super;
|
struct ddf_super *super;
|
||||||
int rv;
|
int rv;
|
||||||
|
|
||||||
#ifndef MDASSEMBLE
|
|
||||||
/* if 'fd' is a container, load metadata from all the devices */
|
|
||||||
if (load_super_ddf_all(st, fd, &st->sb, devname) == 0)
|
|
||||||
return 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (get_dev_size(fd, devname, &dsize) == 0)
|
if (get_dev_size(fd, devname, &dsize) == 0)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
|
|
@ -3047,11 +3047,6 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
|
||||||
struct intel_super *super;
|
struct intel_super *super;
|
||||||
int rv;
|
int rv;
|
||||||
|
|
||||||
#ifndef MDASSEMBLE
|
|
||||||
if (load_super_imsm_all(st, fd, &st->sb, devname) == 0)
|
|
||||||
return 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (test_partition(fd))
|
if (test_partition(fd))
|
||||||
/* IMSM not allowed on partitions */
|
/* IMSM not allowed on partitions */
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in New Issue