diff options
| author | Adam Kwolek <adam.kwolek@intel.com> | 2011-06-15 09:13:49 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-06-15 09:13:49 +1000 |
| commit | f8b72ef517ea305f714230b0503f94ae5f1b8fa4 (patch) | |
| tree | acb249e4d2bc369b3dc43dc9466937e36e538f86 | |
| parent | 7534230b07cffa1cd74153a344090c1892fcebdc (diff) | |
| download | mdadm-f8b72ef517ea305f714230b0503f94ae5f1b8fa4.tar.gz | |
imsm: FIX: Sometimes reshape cannot be finished
When array size is not aligned to copy area, number of migration unit
is increased in init_migr_record_imsm():7665 to reshape whole array.
During calculation of last migration unit, this should be in mind also,
otherwise checkpoint (max-1) is always written and reshape
is never finished in mdadm.
Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | super-intel.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/super-intel.c b/super-intel.c index 5dc8ca8..bb76f74 100644 --- a/super-intel.c +++ b/super-intel.c @@ -7788,24 +7788,34 @@ abort: int save_checkpoint_imsm(struct supertype *st, struct mdinfo *info, int state) { struct intel_super *super = st->sb; + unsigned long long blocks_per_unit; + unsigned long long curr_migr_unit; + if (load_imsm_migr_rec(super, info) != 0) { dprintf("imsm: ERROR: Cannot read migration record " "for checkpoint save.\n"); return 1; } - if (__le32_to_cpu(super->migr_rec->blocks_per_unit) == 0) { + blocks_per_unit = __le32_to_cpu(super->migr_rec->blocks_per_unit); + if (blocks_per_unit == 0) { dprintf("imsm: no migration in progress.\n"); return 2; } + curr_migr_unit = info->reshape_progress / blocks_per_unit; + /* check if array is alligned to copy area + * if it is not alligned, add one to current migration unit value + * this can happend on array reshape finish only + */ + if (info->reshape_progress % blocks_per_unit) + curr_migr_unit++; super->migr_rec->curr_migr_unit = - __cpu_to_le32(info->reshape_progress / - __le32_to_cpu(super->migr_rec->blocks_per_unit)); + __cpu_to_le32(curr_migr_unit); super->migr_rec->rec_status = __cpu_to_le32(state); super->migr_rec->dest_1st_member_lba = - __cpu_to_le32((__le32_to_cpu(super->migr_rec->curr_migr_unit)) - * __le32_to_cpu(super->migr_rec->dest_depth_per_unit)); + __cpu_to_le32(curr_migr_unit * + __le32_to_cpu(super->migr_rec->dest_depth_per_unit)); if (write_imsm_migr_rec(st) < 0) { dprintf("imsm: Cannot write migration record " "outside backup area\n"); |