imsm: Disable checkpoint updating by mdmon for general migration

imsm contains 2 check-pointing mechanism. One (per array) is used for
initialization and rebuild and second (per container) is used for general
migration (reshape). First is controlled by mdmon, second by mdadm.
To avoid conflicts disable mdmon checkpoints updating for general
migration.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Adam Kwolek 2011-06-08 17:11:49 +10:00 committed by NeilBrown
parent 276d77db1f
commit 5b83bacff6
1 changed files with 7 additions and 0 deletions

View File

@ -5851,6 +5851,12 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
}
mark_checkpoint:
/* skip checkpointing for general migration,
* it is controlled in mdadm
*/
if (is_gen_migration(dev))
goto skip_mark_checkpoint;
/* check if we can update curr_migr_unit from resync_start, recovery_start */
blocks_per_unit = blocks_per_migr_unit(super, dev);
if (blocks_per_unit) {
@ -5872,6 +5878,7 @@ mark_checkpoint:
}
}
skip_mark_checkpoint:
/* mark dirty / clean */
if (dev->vol.dirty != !consistent) {
dprintf("imsm: mark '%s'\n", consistent ? "clean" : "dirty");