summaryrefslogtreecommitdiffstats
path: root/Assemble.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2015-08-03 08:06:51 +0200
committerNeilBrown <neilb@suse.com>2015-08-03 08:06:51 +0200
commit8360760457860206e2719c069b30552e79018c59 (patch)
tree1481a193b9ccd3edc957792fd44e05caad15d294 /Assemble.c
parentmdassemble: include mapfile support. (diff)
downloadmdadm-8360760457860206e2719c069b30552e79018c59.tar.xz
mdadm-8360760457860206e2719c069b30552e79018c59.zip
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>
Diffstat (limited to 'Assemble.c')
-rw-r--r--Assemble.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Assemble.c b/Assemble.c
index 06e122df..29257330 100644
--- 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);