From: Adam Kwolek Date: Thu, 9 Feb 2012 01:37:40 +0000 (+1100) Subject: FIX: restart reshape when reshape process is stopped just between 2 reshapes X-Git-Tag: mdadm-3.2.4~79 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1dd332a09c66ef0df68229cc633b8f2521e5db4;p=thirdparty%2Fmdadm.git FIX: restart reshape when reshape process is stopped just between 2 reshapes When reshape is restarted from '0', very begin of array it is possible that for external metadata reshape and array configuration doesn't happen. Check if md has the same opinion, and reshape is restarted from 0. If so, this is regular reshape start after reshape switch in metadata to next array only. Signed-off-by: Adam Kwolek Signed-off-by: NeilBrown --- diff --git a/Grow.c b/Grow.c index 6b1380a2..61adefa5 100644 --- a/Grow.c +++ b/Grow.c @@ -1980,6 +1980,18 @@ static int reshape_array(char *container, int fd, char *devname, goto release; } + if (st->ss->external && restart && (info->reshape_progress == 0)) { + /* When reshape is restarted from '0', very begin of array + * it is possible that for external metadata reshape and array + * configuration doesn't happen. + * Check if md has the same opinion, and reshape is restarted + * from 0. If so, this is regular reshape start after reshape + * switch in metadata to next array only. + */ + if ((verify_reshape_position(info, reshape.level) >= 0) && + (info->reshape_progress == 0)) + restart = 0; + } if (restart) { /* reshape already started. just skip to monitoring the reshape */ if (reshape.backup_blocks == 0)