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>

diff --git a/super-ddf.c b/super-ddf.c
index b3890aae7d63849c20d9335c6df5ecd1a57474b2..bd3e8840c54efaf569f11273925e2d9194fc6e91 100644 (file)
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -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;
 

diff --git a/super-intel.c b/super-intel.c
index f158163bc9e7d4633bc81a809147e108059353fa..ab6a2d5118d5ad40431cfde4ca070a815143b032 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -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;