Add must_be_container helper.

[thirdparty/mdadm.git] / Examine.c

diff --git a/Examine.c b/Examine.c
index f0e98f974d2e58885ebc238cdd796690bf4a9dee..ffca9ca5f9d615721b68db3a9af0a1d2eda57788 100644 (file)
--- 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)
 {
@@ -63,7 +63,8 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
        } *arrays = NULL;
 
        for (; devlist ; devlist=devlist->next) {
-               struct supertype *st = forcest;
+               struct supertype *st;
+               int have_container = 0;
 
                fd = dev_open(devlist->devname, O_RDONLY);
                if (fd < 0) {
@@ -75,13 +76,29 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
                        err = 1;
                }
                else {
-                       if (!st)
+                       int container = 0;
+                       if (forcest)
+                               st = dup_super(forcest);
+                       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;
@@ -98,7 +115,11 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
                                             devlist->devname, 0, 0, NULL);
                /* Ok, its good enough to try, though the checksum could be wrong */
 
-               if (brief) {
+               if (brief && st->ss->brief_examine_super == NULL) {
+                       if (!scan)
+                               fprintf(stderr, Name ": No brief listing for %s on %s\n",
+                                       st->ss->name, devlist->devname);
+               } else if (brief) {
                        struct array *ap;
                        char *d;
                        for (ap=arrays; ap; ap=ap->next) {
@@ -113,12 +134,11 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
                                ap->spares = 0;
                                ap->st = st;
                                arrays = ap;
-                               st->ss->getinfo_super(st, &ap->info);
-                       } else {
-                               st->ss->getinfo_super(st, &ap->info);
-                               st->ss->free_super(st);
-                       }
-                       if (!(ap->info.disk.state & (1<<MD_DISK_SYNC)))
+                               st->ss->getinfo_super(st, &ap->info, NULL);
+                       } else
+                               st->ss->getinfo_super(st, &ap->info, NULL);
+                       if (!have_container &&
+                           !(ap->info.disk.state & (1<<MD_DISK_SYNC)))
                                ap->spares++;
                        d = dl_strdup(devlist->devname);
                        dl_add(ap->devs, d);
@@ -136,15 +156,23 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
                for (ap=arrays; ap; ap=ap->next) {
                        char sep='=';
                        char *d;
+                       int newline = 0;
+
                        ap->st->ss->brief_examine_super(ap->st, brief > 1);
-                       if (ap->spares) printf("   spares=%d", ap->spares);
+                       if (ap->spares)
+                               newline += printf("   spares=%d", ap->spares);
                        if (brief > 1) {
-                               printf("   devices");
+                               newline += printf("   devices");
                                for (d=dl_next(ap->devs); d!= ap->devs; d=dl_next(d)) {
                                        printf("%c%s", sep, d);
                                        sep=',';
                                }
                        }
+                       if (ap->st->ss->brief_examine_subarrays) {
+                               if (newline)
+                                       printf("\n");
+                               ap->st->ss->brief_examine_subarrays(ap->st, brief > 1);
+                       }
                        ap->st->ss->free_super(ap->st);
                        /* FIXME free ap */
                        if (ap->spares || brief > 1)