From 922a58292fafa4efcfcd44fbc46b0665681c955a Mon Sep 17 00:00:00 2001 From: Tomasz Majchrzak Date: Fri, 9 Jun 2017 16:20:19 +0200 Subject: [PATCH] Grow: don't allow to enable PPL when reshape is in progress Git-commit: 922a58292fafa4efcfcd44fbc46b0665681c955a Patch-mainline: mdadm-4.0+ References: bsc#1069165, bsc#1069167, bsc#1068030 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 Signed-off-by: Jes Sorensen Signed-off-by: Coly Li --- 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