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
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From 922a58292fafa4efcfcd44fbc46b0665681c955a Mon Sep 17 00:00:00 2001
|
|
From: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
|
|
Date: Fri, 9 Jun 2017 16:20:19 +0200
|
|
Subject: [PATCH] Grow: don't allow to enable PPL when reshape is in progress
|
|
|
|
Don't allow to enable PPL consistency policy when reshape is in progress.
|
|
Current PPL implementation doesn't work when reshape is taking place.
|
|
|
|
Signed-off-by: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
Grow.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/Grow.c b/Grow.c
|
|
index f7325cb..b1cb306 100644
|
|
--- a/Grow.c
|
|
+++ b/Grow.c
|
|
@@ -530,6 +530,7 @@ int Grow_consistency_policy(char *devname, int fd, struct context *c, struct sha
|
|
char *subarray = NULL;
|
|
int ret = 0;
|
|
char container_dev[PATH_MAX];
|
|
+ char buf[20];
|
|
|
|
if (s->consistency_policy != CONSISTENCY_POLICY_RESYNC &&
|
|
s->consistency_policy != CONSISTENCY_POLICY_PPL) {
|
|
@@ -577,6 +578,17 @@ int Grow_consistency_policy(char *devname, int fd, struct context *c, struct sha
|
|
goto free_info;
|
|
}
|
|
|
|
+ if (s->consistency_policy == CONSISTENCY_POLICY_PPL) {
|
|
+ if (sysfs_get_str(sra, NULL, "sync_action", buf, 20) <= 0) {
|
|
+ ret = 1;
|
|
+ goto free_info;
|
|
+ } else if (strcmp(buf, "reshape\n") == 0) {
|
|
+ pr_err("PPL cannot be enabled when reshape is in progress\n");
|
|
+ ret = 1;
|
|
+ goto free_info;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (subarray) {
|
|
char *update;
|
|
|
|
--
|
|
2.12.0
|
|
|