[dm-devel] [PATCH 03/10] multipath: fix setting conf->version

[Martin Wilck]

On Fri, 2018-07-13 at 14:39 -0500, Benjamin Marzinski wrote:
> Commit d3b71498 stopped multipath from setting conf->version.
> Instead,
> it was always being set to 0.0.0. Multipathd was still setting this
> correctly.
> 
> Fixes: d3b71498 "multipath: fix rcu thread cancellation hang"
> Signed-off-by: Benjamin Marzinski <bmarzins at redhat.com>
> ---
>  libmultipath/devmapper.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
Reviewed-by: Martin Wilck <mwilck at suse.com>


> diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
> index f2befad..8136d15 100644
> --- a/libmultipath/devmapper.c
> +++ b/libmultipath/devmapper.c
> @@ -245,13 +245,13 @@ void libmp_dm_init(void)
>  	int verbosity;
>  	unsigned int version[3];
>  
> +	if (dm_prereq(version))
> +		exit(1);
>  	conf = get_multipath_config();
>  	verbosity = conf->verbosity;
> -	memcpy(version, conf->version, sizeof(version));
> +	memcpy(conf->version, version, sizeof(version));
>  	put_multipath_config(conf);
>  	dm_init(verbosity);
> -	if (dm_prereq(version))
> -		exit(1);
>  	dm_udev_set_sync_support(libmp_dm_udev_sync);
>  }
>  

-- 
Dr. Martin Wilck <mwilck at suse.com>, Tel. +49 (0)911 74053 2107
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)