<div dir="ltr">Merged.</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Oct 17, 2016 at 6:32 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"><div class="HOEnZb"><div class="h5">replace RR_WEIGHT_NONE with DEFAULT_RR_WEIGHT, and define DEFAULT_FLUSH<br>
<br>
Cc: Benjamin Marzinski <<a href="mailto:bmarzins@redhat.com">bmarzins@redhat.com</a>><br>
Cc: Hannes Reinecke <<a href="mailto:hare@suse.de">hare@suse.de</a>><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/defaults.h | 1 +<br>
libmultipath/propsel.c | 4 ++--<br>
2 files changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h<br>
index 9bf27d6..d00a86f 100644<br>
--- a/libmultipath/defaults.h<br>
+++ b/libmultipath/defaults.h<br>
@@ -31,6 +31,7 @@<br>
#define DEFAULT_PRIO "const"<br>
#define DEFAULT_PRIO_ARGS ""<br>
#define DEFAULT_CHECKER TUR<br>
+#define DEFAULT_FLUSH FLUSH_DISABLED<br>
<br>
#define DEFAULT_CHECKINT 5<br>
#define MAX_CHECKINT(a) (a << 2)<br>
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c<br>
index 1625990..88a1916 100644<br>
--- a/libmultipath/propsel.c<br>
+++ b/libmultipath/propsel.c<br>
@@ -137,7 +137,7 @@ select_rr_weight (struct config *conf, struct multipath * mp)<br>
mp_set_ovr(rr_weight);<br>
mp_set_hwe(rr_weight);<br>
mp_set_conf(rr_weight);<br>
- mp_set_default(rr_weight, RR_WEIGHT_NONE);<br>
+ mp_set_default(rr_weight, DEFAULT_RR_WEIGHT);<br>
out:<br>
print_rr_weight(buff, 13, &mp->rr_weight);<br>
condlog(3, "%s: rr_weight = %s %s", mp->alias, buff, origin);<br>
@@ -550,7 +550,7 @@ select_flush_on_last_del(<wbr>struct config *conf, struct multipath *mp)<br>
mp_set_ovr(flush_on_last_del);<br>
mp_set_hwe(flush_on_last_del);<br>
mp_set_conf(flush_on_last_del)<wbr>;<br>
- mp_set_default(flush_on_last_<wbr>del, FLUSH_DISABLED);<br>
+ mp_set_default(flush_on_last_<wbr>del, DEFAULT_FLUSH);<br>
out:<br>
condlog(3, "%s: flush_on_last_del = %s %s", mp->alias,<br>
(mp->flush_on_last_del == FLUSH_ENABLED)? "yes" : "no", origin);<br>
--<br>
2.10.1<br>
<br>
</div></div></blockquote></div><br></div>