[dm-devel] [PATCH v4 07/20] libmultipath: change find_multipaths option to multi-value

[Martin Wilck]

On Wed, 2018-04-04 at 18:16 +0200, Martin Wilck wrote:

> diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
> index 11afe09..da685be 100644
> --- a/libmultipath/wwids.c
> +++ b/libmultipath/wwids.c
> @@ -282,8 +282,12 @@ should_multipath(struct path *pp1, vector
> pathvec, vector mpvec)
>  	struct config *conf;
>  
>  	conf = get_multipath_config();
> -	ignore_new_devs = conf->ignore_new_devs;
> -	find_multipaths = conf->find_multipaths;
> +	ignore_new_devs = ignore_new_devs_on(conf);
> +	find_multipaths = find_multipaths_on(conf);
> +	if (!find_multipaths && !ignore_new_devs) {
> +		put_multipath_config(conf);
> +		return 1;
> +	}
>  	put_multipath_config(conf);
>  	if (find_multipaths && !ignore_new_devs)
>  		return 1;
> 

I made a mistake during rebase here. Will be fixed in v5.

Martin

-- 
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)