Assemble: really don't assemble IMSM array without OROM.

Previous patch missed on case.

Also print more useful information when rejecting
a device with IMSM metadata.

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

diff --git a/Assemble.c b/Assemble.c
index 06e122df6258a8e3c6a8c604182a4e512a979971..2925733081e3967ccf02106ba10dc243ef22ca29 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -250,7 +250,9 @@ static int select_devices(struct mddev_dev *devlist,
                                        pr_err("no recogniseable superblock on %s\n",
                                               devname);
                                tmpdev->used = 2;
-                       } else if (tst->ss->load_super(tst,dfd, NULL)) {
+                       } else if ((tst->ignore_hw_compat = 0),
+                                  tst->ss->load_super(tst, dfd,
+                                                      report_mismatch ? devname : NULL)) {
                                if (report_mismatch)
                                        pr_err("no RAID superblock on %s\n",
                                               devname);

diff --git a/Incremental.c b/Incremental.c
index 885761971995a9525379c6f0e5ee8c55689ba9df..41876b9e70c3c00ca9bfc715176c25b61b24390c 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -205,7 +205,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
        st->ignore_hw_compat = 0;
 
        if (st->ss->compare_super == NULL ||
-           st->ss->load_super(st, dfd, NULL)) {
+           st->ss->load_super(st, dfd, c->verbose >= 0 ? devname : NULL)) {
                if (c->verbose >= 0)
                        pr_err("no RAID superblock on %s.\n",
                                devname);