On Fri, 09 Dec 2011 12:57:20 +0100 Adam Kwolek <adam.kwolek@xxxxxxxxx> wrote:
> This patch is addition to patch:
> "imsm: FIX: Limit migration record operation by disk slot not by index"
> Location of migration record (2 first slots) should be taken on up to date
> information. It is in first map.
> Change slot verification to use first map only.
>
> Signed-off-by: Adam Kwolek <adam.kwolek@xxxxxxxxx>
> ---
>
> super-intel.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/super-intel.c b/super-intel.c
> index 879f4c4..92ff79c 100644
> --- a/super-intel.c
> +++ b/super-intel.c
> @@ -1185,7 +1185,7 @@ void examine_migr_rec_imsm(struct intel_super *super)
> printf("\nMigration Record Information:");
>
> /* map under migration */
> - map = get_imsm_map(dev, MAP_1);
> + map = get_imsm_map(dev, MAP_0);
> if (map)
> slot = get_imsm_disk_slot(map, super->disks->index);
> if ((map == NULL) || (slot > 1) || (slot < 0)) {
> @@ -2138,7 +2138,7 @@ static int load_imsm_migr_rec(struct intel_super *super, struct mdinfo *info)
> */
> if (dev == NULL)
> return 0;
> - map = get_imsm_map(dev, MAP_1);
> + map = get_imsm_map(dev, MAP_0);
>
> if (info) {
> for (sd = info->devs ; sd ; sd = sd->next) {
> @@ -2269,7 +2269,7 @@ static int write_imsm_migr_rec(struct supertype *st)
> vol = 0;
> dev = get_imsm_dev(super, super->current_vol);
> }
> - map = get_imsm_map(dev, MAP_X);
> + map = get_imsm_map(dev, MAP_0);
>
> for (sd = super->disks ; sd ; sd = sd->next) {
> int slot = -1;
^^^^^^^^^^^^^^^^
Patch doesn't apply (Without fuzz) as in my code this is just
int slot;
It doesn't need to be initialised from what I can see, so I've left it as it
is.
Pending confirmation of the earlier patch (vol not used), I've applied these
last 3:
Subject: [PATCH] imsm: FIX: Limit migration record operation by disk slot not by index
Subject: [PATCH] imsm: FIX: Use definitions for migration record disk operations
Subject: [PATCH] imsm: FIX: Use first map only in migration record disk operations
NeilBrown
Attachment:
signature.asc
Description: PGP signature
