X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Examine.c;h=ffca9ca5f9d615721b68db3a9af0a1d2eda57788;hp=f646805b911dfd66e087a768c81d934959206a8d;hb=3a3716107b614f679a4ea224e5bb882739d81cf9;hpb=a5d85af748aafe3e3830b9d16faa5c92e783b171

diff --git a/Examine.c b/Examine.c
index f646805b..ffca9ca5 100644
--- a/Examine.c
+++ b/Examine.c
@@ -30,7 +30,7 @@
 #endif
 #include	"md_u.h"
 #include	"md_p.h"
-int Examine(mddev_dev_t devlist, int brief, int export, int scan,
+int Examine(struct mddev_dev *devlist, int brief, int export, int scan,
 	    int SparcAdjust, struct supertype *forcest,
 	    char *homehost)
 {
@@ -64,6 +64,7 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 
 	for (; devlist ; devlist=devlist->next) {
 		struct supertype *st;
+		int have_container = 0;
 
 		fd = dev_open(devlist->devname, O_RDONLY);
 		if (fd < 0) {
@@ -75,15 +76,29 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 			err = 1;
 		}
 		else {
+			int container = 0;
 			if (forcest)
 				st = dup_super(forcest);
-			else
+			else if (must_be_container(fd)) {
+				/* might be a container */
+				st = super_by_fd(fd, NULL);
+				container = 1;
+			} else
 				st = guess_super(fd);
-			if (st)
-				err = st->ss->load_super(st, fd,
-							 (brief||scan) ? NULL
-							   :devlist->devname);
-			else {
+			if (st) {
+				err = 1;
+				if (!container)
+					err = st->ss->load_super(st, fd,
+								 (brief||scan) ? NULL
+								 :devlist->devname);
+				if (err && st->ss->load_container) {
+					err = st->ss->load_container(st, fd,
+								 (brief||scan) ? NULL
+								 :devlist->devname);
+					if (!err)
+						have_container = 1;
+				}
+			} else {
 				if (!brief) {
 					fprintf(stderr, Name ": No md superblock detected on %s.\n", devlist->devname);
 					rv = 1;
@@ -122,7 +137,7 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 				st->ss->getinfo_super(st, &ap->info, NULL);
 			} else
 				st->ss->getinfo_super(st, &ap->info, NULL);
-			if (!st->loaded_container &&
+			if (!have_container &&
 			    !(ap->info.disk.state & (1<<MD_DISK_SYNC)))
 				ap->spares++;
 			d = dl_strdup(devlist->devname);