FW: [PATCH 2/2] Grow: Do not fork via systemd if freeze_reshape is set

FW: [PATCH 2/2] Grow: Do not fork via systemd if freeze_reshape is set

[Baldysiak, Pawel]

Mdadm should not run 'grow-continue' unit file for container if
'--freeze-reshape' argument is passed. Otherwise it will be ignored,
and reshape will start anyway.

Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
---
Grow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Grow.c b/Grow.c
index 158a709..487111e 100644
--- a/Grow.c
+++ b/Grow.c
@@ -3472,7 +3472,7 @@ int reshape_container(char *container, char *devname,
                */
               ping_monitor(container);

-              if (!forked && !check_env("MDADM_NO_SYSTEMCTL"))
+             if (!forked && !freeze_reshape && !check_env("MDADM_NO_SYSTEMCTL"))
                               if (continue_via_systemd(container))
                                               return 0;

-- 
1.9.0
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] Grow: Do not fork via systemd if freeze_reshape is set

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1169 bytes --]

On Fri, 30 May 2014 14:40:11 +0000 "Baldysiak, Pawel"
<pawel.baldysiak@intel.com> wrote:

> Mdadm should not run 'grow-continue' unit file for container if
> '--freeze-reshape' argument is passed. Otherwise it will be ignored,
> and reshape will start anyway.
> 
> Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
> Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
> ---
> Grow.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Grow.c b/Grow.c
> index 158a709..487111e 100644
> --- a/Grow.c
> +++ b/Grow.c
> @@ -3472,7 +3472,7 @@ int reshape_container(char *container, char *devname,
>                 */
>                ping_monitor(container);
> 
> -              if (!forked && !check_env("MDADM_NO_SYSTEMCTL"))
> +             if (!forked && !freeze_reshape && !check_env("MDADM_NO_SYSTEMCTL"))
>                                if (continue_via_systemd(container))
>                                                return 0;
> 

Applied - thanks.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]