Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
NeilBrown 2011-01-12 16:18:04 +11:00
parent de697acc4c
commit 4a011f1009
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
super-ddf.c
View File

@ -772,12 +772,6 @@ static int load_super_ddf(struct supertype *st, int fd,
struct ddf_super *super;
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)
return 1;

5
super-intel.c
View File

@ -3047,11 +3047,6 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
struct intel_super *super;
int rv;
#ifndef MDASSEMBLE
if (load_super_imsm_all(st, fd, &st->sb, devname) == 0)
return 0;
#endif
if (test_partition(fd))
/* IMSM not allowed on partitions */
return 1;