850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from SLE12-SP3 to SLE15, re-order all patches. - Rename the following patches, they are deleted and re-add in next part of patches 0001-Generic-support-for-consistency-policy-and-PPL.patch 0002-Detail-show-consistency-policy.patch 0002-The-mdcheck-script-now-adds-messages-to-the-system.patch 0003-imsm-PPL-support.patch 0004-super1-PPL-support.patch 0005-Add-ppl-and-no-ppl-options-for-update.patch 0006-Grow-support-consistency-policy-change.patch 0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch 0008-Retry-HOT_REMOVE_DISK-a-few-times.patch 0009-Introduce-sys_hot_remove_disk.patch 0010-Add-force-flag-to-hot_remove_disk.patch 0011-Detail-handle-non-existent-arrays-better.patch - Synchronize patches from mdadm of SLE12-SP3, the above renamed patches are re-add here, 0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch 0002-imsm-fix-missing-error-message-during-migration.patch 0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch 0004-mdadm-check-the-nodes-when-operate-clustered-array.patch 0005-examine-tidy-up-some-code.patch 0006-mdadm-add-man-page-for-symlinks.patch 0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch 0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch 0009-mdadm-Specify-enough-length-when-write-to-buffer.patch 0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch 0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch 0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch OBS-URL: https://build.opensuse.org/request/show/517978 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
From b4decd517d90098bc2d17d3eddfe858d8b903920 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.com>
|
|
Date: Mon, 27 Mar 2017 14:36:56 +1100
|
|
Subject: [PATCH] Detail: handle non-existent arrays better.
|
|
References: bsc#966773
|
|
|
|
If you call "mdadm --detail" with a device file for an array which
|
|
doesn't exist, such as by
|
|
mknod /dev/md57 b 9 57
|
|
mdadm --detail /dev/md57
|
|
|
|
you get an unhelpful message about and inactive RAID0, and return
|
|
status is '0'. This is confusing.
|
|
|
|
So catch this possibility and print a more useful message, and
|
|
return a non-zero status.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.com>
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
Detail.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/Detail.c b/Detail.c
|
|
index cb33794..3d92855 100644
|
|
--- a/Detail.c
|
|
+++ b/Detail.c
|
|
@@ -110,6 +110,14 @@ int Detail(char *dev, struct context *c)
|
|
if (ioctl(fd, GET_ARRAY_INFO, &array) == 0) {
|
|
inactive = 0;
|
|
} else if (errno == ENODEV && sra) {
|
|
+ if (sra->array.major_version == -1 &&
|
|
+ sra->array.minor_version == -1 &&
|
|
+ sra->devs == NULL) {
|
|
+ pr_err("Array associated with md device %s does not exist.\n", dev);
|
|
+ close(fd);
|
|
+ sysfs_free(sra);
|
|
+ return rv;
|
|
+ }
|
|
array = sra->array;
|
|
inactive = 1;
|
|
} else {
|
|
--
|
|
2.10.2
|
|
|