<div dir="ltr">Merged.<div>Thanks.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Oct 16, 2016 at 3:59 PM, Xose Vazquez Perez <span dir="ltr"><<a href="mailto:xose.vazquez@gmail.com" target="_blank">xose.vazquez@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Similar patterns.<br>
<br>
Cc: Christophe Varoqui <<a href="mailto:christophe.varoqui@opensvc.com">christophe.varoqui@opensvc.<wbr>com</a>><br>
Cc: device-mapper development <<a href="mailto:dm-devel@redhat.com">dm-devel@redhat.com</a>><br>
Signed-off-by: Xose Vazquez Perez <<a href="mailto:xose.vazquez@gmail.com">xose.vazquez@gmail.com</a>><br>
---<br>
libmultipath/blacklist.c | 8 +-------<br>
multipath/multipath.conf.5 | 2 +-<br>
2 files changed, 2 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c<br>
index aa8d975..f6c4506 100644<br>
--- a/libmultipath/blacklist.c<br>
+++ b/libmultipath/blacklist.c<br>
@@ -172,7 +172,7 @@ setup_default_blist (struct config * conf)<br>
char * str;<br>
int i;<br>
<br>
- str = STRDUP("^(ram|raw|loop|fd|md|<wbr>dm-|sr|scd|st)[0-9]");<br>
+ str = STRDUP("^(ram|raw|loop|fd|md|<wbr>dm-|sr|scd|st|dcssblk)[0-9]");<br>
if (!str)<br>
return 1;<br>
if (store_ble(conf->blist_<wbr>devnode, str, ORIGIN_DEFAULT))<br>
@@ -184,12 +184,6 @@ setup_default_blist (struct config * conf)<br>
if (store_ble(conf->blist_<wbr>devnode, str, ORIGIN_DEFAULT))<br>
return 1;<br>
<br>
- str = STRDUP("^dcssblk[0-9]");<br>
- if (!str)<br>
- return 1;<br>
- if (store_ble(conf->blist_<wbr>devnode, str, ORIGIN_DEFAULT))<br>
- return 1;<br>
-<br>
str = STRDUP("^nvme");<br>
if (!str)<br>
return 1;<br>
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5<br>
index 313e21b..367688e 100644<br>
--- a/multipath/multipath.conf.5<br>
+++ b/multipath/multipath.conf.5<br>
@@ -851,7 +851,7 @@ The following keywords are recognized:<br>
Regular expression of the device nodes to be excluded.<br>
.RS<br>
.TP<br>
-Default value is: \fB^(ram|raw|loop|fd|md|dm-|<wbr>sr|scd|st)[0-9]\fR, \fB^(td|hd|vd)[a-z]\fR, \fB^dcssblk[0-9]\fR and \fB^nvme\fR<br>
+Default value is: \fB^(ram|raw|loop|fd|md|dm-|<wbr>sr|scd|st|dcssblk)[0-9]\fR, \fB^(td|hd|vd)[a-z]\fR and \fB^nvme\fR<br>
.RE<br>
.TP<br>
.B wwid<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.10.1<br>
<br>
</font></span></blockquote></div><br></div>