From: Adam Kwolek Date: Thu, 6 Jan 2011 07:29:07 +0000 (+1100) Subject: imsm: Finalize reshape in metadata X-Git-Tag: mdadm-3.2~131 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4546b618996b3a239936062ad5c3015d6d83f28;p=thirdparty%2Fmdadm.git imsm: Finalize reshape in metadata When reshape is finished monitor calls set_array_state() and finishes migration in metadata. This change allows for finishing metadata migration on reshape end. Signed-off-by: Adam Kwolek Signed-off-by: NeilBrown --- diff --git a/super-intel.c b/super-intel.c index 5bc4aaa9..27385bb7 100644 --- a/super-intel.c +++ b/super-intel.c @@ -4882,6 +4882,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent) dev->vol.curr_migr_unit = __cpu_to_le32(unit); super->updates_pending++; } + return 0; } else { if (a->last_checkpoint == 0 && a->prev_action == reshape) { /* for some reason we aborted the reshape. @@ -4916,7 +4917,6 @@ static int imsm_set_array_state(struct active_array *a, int consistent) super->updates_pending++; } } - return 0; } /* before we activate this array handle any missing disks */