From: Adam Kwolek <adam.kwolek@intel.com>
Date: Thu, 10 Mar 2011 07:30:42 +0000 (+0100)
Subject: FIX: Unfreeze array on success only
X-Git-Tag: mdadm-3.2.1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcc9e9edd0669a1d99b77e38dc94ae8a644f4d36;p=thirdparty%2Fmdadm.git

FIX: Unfreeze array on success only

Unfreeze array on success only.
rv is initialized by restart variable so we have 2 cases.
1. regular reshape start
	rv == restart == 0
   this means that real error (returned by reshape) can cause leaving container frozen
   If array is not touched by reshape it can be unfrozen
2. During reshape restart even untouched array under reshape is left unfrozen,
   If reshape is started do not unfreeze array on error also.

This allows user for array repair action
(mdmon will not change array state).

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Grow.c b/Grow.c
index 9b4d5fbd..40e693ed 100644
--- a/Grow.c
+++ b/Grow.c
@@ -2205,6 +2205,7 @@ int reshape_container(char *container, char *devname,
 		      int quiet, int restart)
 {
 	struct mdinfo *cc = NULL;
+	int rv = restart;
 
 	/* component_size is not meaningful for a container,
 	 * so pass '-1' meaning 'no change'
@@ -2249,7 +2250,6 @@ int reshape_container(char *container, char *devname,
 		 * will take over the reshape.
 		 */
 		struct mdinfo *content;
-		int rv;
 		int fd;
 		struct mdstat_ent *mdstat;
 		char *adev;
@@ -2292,7 +2292,8 @@ int reshape_container(char *container, char *devname,
 		if (rv)
 			break;
 	}
-	unfreeze(st);
+	if (!rv)
+		unfreeze(st);
 	sysfs_free(cc);
 	exit(0);
 }