diff options
| author | Adam Kwolek <adam.kwolek@intel.com> | 2011-12-07 13:57:43 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-12-08 04:08:20 +0100 |
| commit | 04ed49b3cf32d91714f25f390ff23fa89233866d (patch) | |
| tree | 161613812ce9a39a24c8a4659cce77beeb37ca27 | |
| parent | fix: imsm: validate strip size - tuned up (diff) | |
| download | mdadm-04ed49b3cf32d91714f25f390ff23fa89233866d.tar.xz mdadm-04ed49b3cf32d91714f25f390ff23fa89233866d.zip | |
imsm: FIX: Remove longer map request
We shouldn't use longer map. mdadm should know what map is accessed
at the moment.
Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | super-intel.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/super-intel.c b/super-intel.c index 21aa516b..9b3d6bea 100644 --- a/super-intel.c +++ b/super-intel.c @@ -667,12 +667,9 @@ struct imsm_map *get_imsm_map(struct imsm_dev *dev, int second_map) { /* A device can have 2 maps if it is in the middle of a migration. * If second_map is: - * MAP_0 or - * 0 - we return the first map - * MAP_1 or - * 1 - we return the second map if it exists, else NULL + * MAP_0 or 0 - we return the first map + * MAP_1 or 1 - we return the second map if it exists, else NULL * -1 - we return the second map if it exists, else the first - * -2 - we return longer map /excluding uninitialized state/ */ struct imsm_map *map = &dev->vol.map[0]; struct imsm_map *map2 = NULL; @@ -692,12 +689,6 @@ struct imsm_map *get_imsm_map(struct imsm_dev *dev, int second_map) if (map2) map = map2; break; - case -2: - if (map2 - && map2->map_state != IMSM_T_STATE_UNINITIALIZED - && map2->num_members > map->num_members) - map = map2; - break; default: map = NULL; } @@ -6421,7 +6412,7 @@ static void imsm_set_disk(struct active_array *a, int n, int state) dprintf("imsm: set_disk %d:%x\n", n, state); - ord = get_imsm_ord_tbl_ent(dev, n, -2); + ord = get_imsm_ord_tbl_ent(dev, n, 0); disk = get_imsm_disk(super, ord_to_idx(ord)); /* check for new failures */ |