<div dir="ltr">Merged.<div>Thanks.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Mar 17, 2017 at 1:35 AM, 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">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>
libdmmp/docs/kernel-doc | 2 +-<br>
libmultipath/uevent.c | 12 ++++++------<br>
multipath/multipath.conf.5 | 2 +-<br>
3 files changed, 8 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/libdmmp/docs/kernel-doc b/libdmmp/docs/kernel-doc<br>
index 030fc63..8f5b546 100644<br>
--- a/libdmmp/docs/kernel-doc<br>
+++ b/libdmmp/docs/kernel-doc<br>
@@ -414,7 +414,7 @@ my $doc_com = '\s*\*\s*';<br>
my $doc_com_body = '\s*\* ?';<br>
my $doc_decl = $doc_com . '(\w+)';<br>
# @params and a strictly limited set of supported section names<br>
-my $doc_sect = $doc_com .<br>
+my $doc_sect = $doc_com .<br>
'\s*(\@[.\w]+|\@\.\.\.|<wbr>description|context|returns?|<wbr>notes?|examples?)\s*:(.*)';<br>
my $doc_content = $doc_com_body . '(.*)';<br>
my $doc_block = $doc_com . 'DOC:\s*(.*)?';<br>
diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c<br>
index 367e129..4fbd1df 100644<br>
--- a/libmultipath/uevent.c<br>
+++ b/libmultipath/uevent.c<br>
@@ -113,7 +113,7 @@ uevent_get_wwid(struct uevent *uev)<br>
<br>
conf = get_multipath_config();<br>
uid_attribute = parse_uid_attribute_by_attrs(<wbr>conf->uid_attrs, uev->kernel);<br>
- put_multipath_config(conf);<br>
+ put_multipath_config(conf);<br>
<br>
if (!uid_attribute)<br>
return;<br>
@@ -138,7 +138,7 @@ uevent_need_merge(void)<br>
conf = get_multipath_config();<br>
if (conf->uid_attrs)<br>
need_merge = true;<br>
- put_multipath_config(conf);<br>
+ put_multipath_config(conf);<br>
<br>
return need_merge;<br>
}<br>
@@ -173,12 +173,12 @@ uevent_can_discard(struct uevent *uev)<br>
if (uevent_can_discard_by_<wbr>devpath(uev->devpath))<br>
return true;<br>
<br>
- /*<br>
+ /*<br>
* do not filter dm devices by devnode<br>
*/<br>
if (!strncmp(uev->kernel, "dm-", 3))<br>
return false;<br>
- /*<br>
+ /*<br>
* filter paths devices by devnode<br>
*/<br>
conf = get_multipath_config();<br>
@@ -309,12 +309,12 @@ uevent_filter(struct uevent *later, struct list_head *tmpq)<br>
<br>
list_for_some_entry_reverse_<wbr>safe(earlier, tmp, &later->node, tmpq, node) {<br>
/*<br>
- * filter unnessary earlier uevents<br>
+ * filter unnessary earlier uevents<br>
* by the later uevent<br>
*/<br>
if (uevent_can_filter(earlier, later)) {<br>
condlog(2, "uevent: %s-%s has filtered by uevent: %s-%s",<br>
- earlier->kernel, earlier->action,<br>
+ earlier->kernel, earlier->action,<br>
later->kernel, later->action);<br>
<br>
list_del_init(&earlier->node);<br>
diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5<br>
index efeead5..24decf7 100644<br>
--- a/multipath/multipath.conf.5<br>
+++ b/multipath/multipath.conf.5<br>
@@ -208,7 +208,7 @@ The default is: \fBfailover\fR<br>
.<br>
.TP<br>
.B uid_attrs<br>
-The udev attribute providing a unique path identifier for corresponding<br>
+The udev attribute providing a unique path identifier for corresponding<br>
type of path devices. If this field is configured and matched with type<br>
of device, it would override any other methods providing for device<br>
unique identifier in config file, and it would activate merging uevents<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.12.0<br>
<br>
</font></span></blockquote></div><br></div>