]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
imsm: Do not indicate resync during reshape
authorAdam Kwolek <adam.kwolek@intel.com>
Thu, 16 Dec 2010 04:48:27 +0000 (15:48 +1100)
committerNeilBrown <neilb@suse.de>
Thu, 16 Dec 2010 04:48:27 +0000 (15:48 +1100)
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>
super-intel.c

index 3182d4741ebbb2dcac05b870f0a193ddc8ed3630..4e5bbc39023a24befb93b492625ecddd0b40f1db 100644 (file)
@@ -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;