Use new load_container in Examine

This makes explicit the two different ways to use Examine
And removes a user of container_loaded.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 23 insertions, 7 deletions

diff --git a/Examine.c b/Examine.c
index f646805b..c8a44b01 100644
--- a/Examine.c
+++ b/Examine.c
@@ -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,30 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 			err = 1;
 		}
 		else {
+			unsigned long long size;
+			int container = 0;
 			if (forcest)
 				st = dup_super(forcest);
-			else
+			else if (get_dev_size(fd, NULL, &size) == 0 || size == 0) {
+				/* 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 +138,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);