From: NeilBrown <neilb@suse.de>
Date: Wed, 12 Jan 2011 05:18:04 +0000 (+1100)
Subject: load_super  should not try to load_container
X-Git-Tag: mdadm-3.2~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a011f1009c4d99e8df63bc7d7f538f4b01ff989;p=thirdparty%2Fmdadm.git

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 b3890aae..bd3e8840 100644
--- 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 f158163b..ab6a2d51 100644
--- 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;