[dm-devel] [PATCH] multipath-tools: merge dcssblk in similar blacklist regex

[Christophe Varoqui]

Merged.
Thanks.

On Sun, Oct 16, 2016 at 3:59 PM, Xose Vazquez Perez <xose.vazquez at gmail.com>
wrote:

> Similar patterns.
>
> Cc: Christophe Varoqui <christophe.varoqui at opensvc.com>
> Cc: device-mapper development <dm-devel at redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez at gmail.com>
> ---
>  libmultipath/blacklist.c   | 8 +-------
>  multipath/multipath.conf.5 | 2 +-
>  2 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
> index aa8d975..f6c4506 100644
> --- a/libmultipath/blacklist.c
> +++ b/libmultipath/blacklist.c
> @@ -172,7 +172,7 @@ setup_default_blist (struct config * conf)
>         char * str;
>         int i;
>
> -       str = STRDUP("^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]");
> +       str = STRDUP("^(ram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]");
>         if (!str)
>                 return 1;
>         if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
> @@ -184,12 +184,6 @@ setup_default_blist (struct config * conf)
>         if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
>                 return 1;
>
> -       str = STRDUP("^dcssblk[0-9]");
> -       if (!str)
> -               return 1;
> -       if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
> -               return 1;
> -
>         str = STRDUP("^nvme");
>         if (!str)
>                 return 1;
> diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
> index 313e21b..367688e 100644
> --- a/multipath/multipath.conf.5
> +++ b/multipath/multipath.conf.5
> @@ -851,7 +851,7 @@ The following keywords are recognized:
>  Regular expression of the device nodes to be excluded.
>  .RS
>  .TP
> -Default value is: \fB^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]\fR,
> \fB^(td|hd|vd)[a-z]\fR, \fB^dcssblk[0-9]\fR and \fB^nvme\fR
> +Default value is: \fB^(ram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]\fR,
> \fB^(td|hd|vd)[a-z]\fR and \fB^nvme\fR
>  .RE
>  .TP
>  .B wwid
> --
> 2.10.1
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/dm-devel/attachments/20161016/ab49ee22/attachment.htm>