Introduce pr_err for printing error messages.

[thirdparty/mdadm.git] / Examine.c

diff --git a/Examine.c b/Examine.c
index f646805b911dfd66e087a768c81d934959206a8d..6131e3679e43d087fb2ac355d057ef8d47ba6fff 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)
 {
@@ -64,28 +64,45 @@ 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) {
                        if (!scan) {
-                               fprintf(stderr,Name ": cannot open %s: %s\n",
-                                       devlist->devname, strerror(errno));
+                               pr_err("cannot open %s: %s\n",
+                                      devlist->devname, strerror(errno));
                                rv = 1;
                        }
                        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;
+                               st->ignore_hw_compat = 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;
+                               }
+                               st->ignore_hw_compat = 0;
+                       } else {
                                if (!brief) {
-                                       fprintf(stderr, Name ": No md superblock detected on %s.\n", devlist->devname);
+                                       pr_err("No md superblock detected on %s.\n", devlist->devname);
                                        rv = 1;
                                }
                                err = 1;
@@ -102,7 +119,7 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 
                if (brief && st->ss->brief_examine_super == NULL) {
                        if (!scan)
-                               fprintf(stderr, Name ": No brief listing for %s on %s\n",
+                               pr_err("No brief listing for %s on %s\n",
                                        st->ss->name, devlist->devname);
                } else if (brief) {
                        struct array *ap;
@@ -122,7 +139,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);
@@ -130,6 +147,7 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
                } else if (export) {
                        if (st->ss->export_examine_super)
                                st->ss->export_examine_super(st);
+                       st->ss->free_super(st);
                } else {
                        printf("%s:\n",devlist->devname);
                        st->ss->examine_super(st, homehost);