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
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 72b616aff26e64079727ea908073027c08f99c07 Mon Sep 17 00:00:00 2001
|
|
From: Zhilong Liu <zlliu@suse.com>
|
|
Date: Tue, 7 Mar 2017 11:13:03 +0800
|
|
Subject: [PATCH] mdadm:add checking clustered bitmap in assemble mode
|
|
|
|
mdadm:Both clustered and internal array don't need
|
|
to specify --bitmap when assembling array.
|
|
|
|
Signed-off-by: Zhilong Liu <zlliu@suse.com>
|
|
Acked-by: Coly Li <colyli@suse.de>
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
mdadm.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/mdadm.c b/mdadm.c
|
|
index b5ac061..d6ad8dc 100644
|
|
--- a/mdadm.c
|
|
+++ b/mdadm.c
|
|
@@ -1095,8 +1095,10 @@ int main(int argc, char *argv[])
|
|
pr_err("bitmap file needed with -b in --assemble mode\n");
|
|
exit(2);
|
|
}
|
|
- if (strcmp(optarg, "internal") == 0) {
|
|
- pr_err("there is no need to specify --bitmap when assembling arrays with internal bitmaps\n");
|
|
+ if (strcmp(optarg, "internal") == 0 ||
|
|
+ strcmp(optarg, "clustered") == 0) {
|
|
+ pr_err("no need to specify --bitmap when assembling"
|
|
+ " arrays with internal or clustered bitmap\n");
|
|
continue;
|
|
}
|
|
bitmap_fd = open(optarg, O_RDWR);
|
|
--
|
|
2.10.2
|
|
|