From: Przemyslaw Czarnowski Date: Wed, 5 Oct 2011 09:59:50 +0000 (+0200) Subject: imsm: always use set_migr_type to set type of migration X-Git-Tag: mdadm-3.2.3~133 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea672ee1190e3ce4e4f0a0e612f9dd1808b31c41;p=thirdparty%2Fmdadm.git imsm: always use set_migr_type to set type of migration For 'resync' besides the update of migration type (imsm_vol.migr_type structure) additionally status (imsm_dev.status) flag is set to DEV_VERIFY_AND_FIX. In order to clean up after migration, status flag must be cleared. For this reason, migration type shouldn't be set directly but via set_migr_type(). Otherwise status does not reflect the state of array. Signed-off-by: Przemyslaw Czarnowski Signed-off-by: NeilBrown --- diff --git a/super-intel.c b/super-intel.c index ce067a2c..587da383 100644 --- a/super-intel.c +++ b/super-intel.c @@ -3111,7 +3111,7 @@ static void end_migration(struct imsm_dev *dev, __u8 map_state) } dev->vol.migr_state = 0; - dev->vol.migr_type = 0; + set_migr_type(dev, 0); dev->vol.curr_migr_unit = 0; map->map_state = map_state; } @@ -6123,7 +6123,7 @@ static void imsm_progress_container_reshape(struct intel_super *super) map->num_members = prev_disks; dev->vol.migr_state = 1; dev->vol.curr_migr_unit = 0; - dev->vol.migr_type = MIGR_GEN_MIGR; + set_migr_type(dev, MIGR_GEN_MIGR); for (i = prev_num_members; i < map->num_members; i++) set_imsm_ord_tbl_ent(map, i, i); @@ -6173,7 +6173,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent) if (0) { struct imsm_map *map2 = get_imsm_map(dev, 1); dev->vol.migr_state = 0; - dev->vol.migr_type = 0; + set_migr_type(dev, 0); dev->vol.curr_migr_unit = 0; memcpy(map, map2, sizeof_imsm_map(map2)); super->updates_pending++; @@ -7052,7 +7052,7 @@ static int apply_reshape_container_disks_update(struct imsm_update_reshape *u, devices_to_reshape--; newdev->vol.migr_state = 1; newdev->vol.curr_migr_unit = 0; - newdev->vol.migr_type = MIGR_GEN_MIGR; + set_migr_type(newdev, MIGR_GEN_MIGR); newmap->num_members = u->new_raid_disks; for (i = 0; i < delta_disks; i++) { set_imsm_ord_tbl_ent(newmap,