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
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 9d67f6496c71efbc68b33aea663dbcc1597a0828 Mon Sep 17 00:00:00 2001
|
|
From: Zhilong Liu <zlliu@suse.com>
|
|
Date: Wed, 1 Mar 2017 18:42:33 +0800
|
|
Subject: [PATCH] mdadm:check the nodes when operate clustered array
|
|
|
|
It doesn't make sense to write_bitmap with less than 2 nodes,
|
|
in order to avoid 'write_bitmap' received invalid nodes number,
|
|
it would be better to do checking nodes in getopt operations.
|
|
|
|
Signed-off-by: Zhilong Liu <zlliu@suse.com>
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
mdadm.c | 4 ++--
|
|
super1.c | 9 +--------
|
|
2 files changed, 3 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/mdadm.c b/mdadm.c
|
|
index 16fd49a..b5ac061 100644
|
|
--- a/mdadm.c
|
|
+++ b/mdadm.c
|
|
@@ -603,8 +603,8 @@ int main(int argc, char *argv[])
|
|
case O(GROW, Nodes):
|
|
case O(CREATE, Nodes):
|
|
c.nodes = parse_num(optarg);
|
|
- if (c.nodes <= 0) {
|
|
- pr_err("invalid number for the number of cluster nodes: %s\n",
|
|
+ if (c.nodes < 2) {
|
|
+ pr_err("clustered array needs two nodes at least: %s\n",
|
|
optarg);
|
|
exit(2);
|
|
}
|
|
diff --git a/super1.c b/super1.c
|
|
index 87a74cb..882cd61 100644
|
|
--- a/super1.c
|
|
+++ b/super1.c
|
|
@@ -2380,14 +2380,7 @@ static int write_bitmap1(struct supertype *st, int fd, enum bitmap_update update
|
|
}
|
|
|
|
if (bms->version == BITMAP_MAJOR_CLUSTERED) {
|
|
- if (st->nodes == 1) {
|
|
- /* the parameter for nodes is not valid */
|
|
- pr_err("Warning: cluster-md at least needs two nodes\n");
|
|
- return -EINVAL;
|
|
- } else if (st->nodes == 0)
|
|
- /* --nodes is not specified */
|
|
- break;
|
|
- else if (__cpu_to_le32(st->nodes) < bms->nodes) {
|
|
+ if (__cpu_to_le32(st->nodes) < bms->nodes) {
|
|
/* Since the nodes num is not increased, no need to check the space
|
|
* is enough or not, just update bms->nodes */
|
|
bms->nodes = __cpu_to_le32(st->nodes);
|
|
--
|
|
2.10.2
|
|
|