<div dir="ltr">Merged.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Oct 19, 2016 at 8:16 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">Replace "const" by PRIO_CONST.<br>
Replace static force_sync and partition_delim values, and define<br>
DEFAULT_FORCE_SYNC and DEFAULT_PARTITION_DELIM<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/config.c | 4 ++--<br>
libmultipath/defaults.h | 4 +++-<br>
2 files changed, 5 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/libmultipath/config.c b/libmultipath/config.c<br>
index 92e4deb..ed51afb 100644<br>
--- a/libmultipath/config.c<br>
+++ b/libmultipath/config.c<br>
@@ -606,8 +606,8 @@ load_config (char * file)<br>
conf->fast_io_fail = DEFAULT_FAST_IO_FAIL;<br>
conf->retain_hwhandler = DEFAULT_RETAIN_HWHANDLER;<br>
conf->detect_prio = DEFAULT_DETECT_PRIO;<br>
- conf->force_sync = 0;<br>
- conf->partition_delim = NULL;<br>
+ conf->force_sync = DEFAULT_FORCE_SYNC;<br>
+ conf->partition_delim = DEFAULT_PARTITION_DELIM;<br>
conf->processed_main_config = 0;<br>
conf->find_multipaths = DEFAULT_FIND_MULTIPATHS;<br>
conf->uxsock_timeout = DEFAULT_REPLY_TIMEOUT;<br>
diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h<br>
index e9581a6..9af9a9a 100644<br>
--- a/libmultipath/defaults.h<br>
+++ b/libmultipath/defaults.h<br>
@@ -28,11 +28,13 @@<br>
#define DEFAULT_RETRIGGER_DELAY 10<br>
#define DEFAULT_RETRIGGER_TRIES 3<br>
#define DEFAULT_UEV_WAIT_TIMEOUT 30<br>
-#define DEFAULT_PRIO "const"<br>
+#define DEFAULT_PRIO PRIO_CONST<br>
#define DEFAULT_PRIO_ARGS ""<br>
#define DEFAULT_CHECKER TUR<br>
#define DEFAULT_FLUSH FLUSH_DISABLED<br>
#define DEFAULT_USER_FRIENDLY_NAMES USER_FRIENDLY_NAMES_OFF<br>
+#define DEFAULT_FORCE_SYNC 0<br>
+#define DEFAULT_PARTITION_DELIM NULL<br>
<br>
#define DEFAULT_CHECKINT 5<br>
#define MAX_CHECKINT(a) (a << 2)<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.10.1<br>
<br>
</font></span></blockquote></div><br></div>