Re: [PATCH 2/2] imsm: abort reshape if sync_action is not "reshape"

[NeilBrown <neilb@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

On Wed, Dec 23 2015, Artur Paszkiewicz wrote:

> When reshape was interrupted, an incorrect checkpoint would be saved in
> the migration record. Change wait_for_reshape_imsm() to return -1 when
> sync_action is not "reshape" to abort early in imsm_manage_reshape()
> without writing the migration record.
>
> Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
> ---
>  super-intel.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/super-intel.c b/super-intel.c
> index e609e0c..c7efa98 100644
> --- a/super-intel.c
> +++ b/super-intel.c
> @@ -10300,8 +10300,10 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
>  		sysfs_wait(fd, NULL);
>  		if (sysfs_get_str(sra, NULL, "sync_action",
>  				  action, 20) > 0 &&
> -				strncmp(action, "reshape", 7) != 0)
> -			break;
> +				strncmp(action, "reshape", 7) != 0) {
> +			close(fd);
> +			return -1;
> +		}
>  		if (sysfs_fd_get_ll(fd, &completed) < 0) {
>  			dprintf("cannot read reshape_position (in loop)\n");
>  			close(fd);
> -- 

Applied, thanks.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]