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>
This commit is contained in:
NeilBrown 2015-08-03 16:06:51 +10:00
parent 187f157bf0
commit 8360760457
2 changed files with 4 additions and 2 deletions

View File

@ -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);

View File

@ -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);