From: Adam Kwolek <adam.kwolek@intel.com>
Date: Thu, 16 Dec 2010 04:48:27 +0000 (+1100)
Subject: imsm: Do not indicate resync during reshape
X-Git-Tag: mdadm-3.2~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c9bc37b9719a9ea3e151b6234595e87a3b1ba62;p=thirdparty%2Fmdadm.git

imsm: Do not indicate resync during reshape

If reshape is started resync is not allowed in parallel. This would
break reshape.  If array is in General Migration state do not indicate
resync and allow for reshape continuation.

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

diff --git a/super-intel.c b/super-intel.c
index 3182d474..4e5bbc39 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -4761,9 +4761,13 @@ static int is_resyncing(struct imsm_dev *dev)
 	    migr_type(dev) == MIGR_REPAIR)
 		return 1;
 
+	if (migr_type(dev) == MIGR_GEN_MIGR)
+		return 0;
+
 	migr_map = get_imsm_map(dev, 1);
 
-	if (migr_map->map_state == IMSM_T_STATE_NORMAL)
+	if ((migr_map->map_state == IMSM_T_STATE_NORMAL) &&
+	    (dev->vol.migr_type != MIGR_GEN_MIGR))
 		return 1;
 	else
 		return 0;