<div dir="ltr">Merged.<div>Thanks.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Oct 3, 2016 at 5:53 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">".*" is useless at the end of a regex, and just "*" is a bug.<br>
And document them.<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 | 6 +++++-<br>
2 files changed, 9 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c<br>
index 9687399..aa8d975 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)[0-9]");<br>
if (!str)<br>
return 1;<br>
if (store_ble(conf->blist_<wbr>devnode, str, ORIGIN_DEFAULT))<br>
@@ -184,19 +184,19 @@ 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>
+ 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>
+ str = STRDUP("^nvme");<br>
if (!str)<br>
return 1;<br>
if (store_ble(conf->blist_<wbr>devnode, str, ORIGIN_DEFAULT))<br>
return 1;<br>
<br>
- str = STRDUP("(SCSI_IDENT_.*|ID_WWN)<wbr>");<br>
+ str = STRDUP("(SCSI_IDENT_|ID_WWN)")<wbr>;<br>
if (!str)<br>
return 1;<br>
if (store_ble(conf->elist_<wbr>property, str, ORIGIN_DEFAULT))<br>
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5<br>
index 7dd997a..7bb847a 100644<br>
--- a/multipath/multipath.conf.5<br>
+++ b/multipath/multipath.conf.5<br>
@@ -849,6 +849,10 @@ The following keywords are recognized:<br>
.TP 17<br>
.B devnode<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>
+.RE<br>
.TP<br>
.B wwid<br>
The \fIWorld Wide Identification\fR of a device.<br>
@@ -888,7 +892,7 @@ The \fIWorld Wide Identification\fR of a device.<br>
Regular expression of the udev property to be whitelisted.<br>
.RS<br>
.TP<br>
-Default value is: \fB(ID_WWN|SCSI_IDENT_.*)\fR<br>
+Default value is: \fB(SCSI_IDENT_|ID_WWN)\fR<br>
.RE<br>
.TP<br>
.B device<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.10.0<br>
<br>
</font></span></blockquote></div><br></div>