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:
parent
187f157bf0
commit
8360760457
|
@ -250,7 +250,9 @@ static int select_devices(struct mddev_dev *devlist,
|
||||||
pr_err("no recogniseable superblock on %s\n",
|
pr_err("no recogniseable superblock on %s\n",
|
||||||
devname);
|
devname);
|
||||||
tmpdev->used = 2;
|
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)
|
if (report_mismatch)
|
||||||
pr_err("no RAID superblock on %s\n",
|
pr_err("no RAID superblock on %s\n",
|
||||||
devname);
|
devname);
|
||||||
|
|
|
@ -205,7 +205,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
|
||||||
st->ignore_hw_compat = 0;
|
st->ignore_hw_compat = 0;
|
||||||
|
|
||||||
if (st->ss->compare_super == NULL ||
|
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)
|
if (c->verbose >= 0)
|
||||||
pr_err("no RAID superblock on %s.\n",
|
pr_err("no RAID superblock on %s.\n",
|
||||||
devname);
|
devname);
|
||||||
|
|
Loading…
Reference in New Issue