In load_config(), conf is freshly allocated, there's no point in checking previously set values.
Signed-off-by: Martin Wilck <[email protected]> --- libmultipath/config.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index 8769441c..ce7bedac 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -607,8 +607,7 @@ load_config (char * file) /* * internal defaults */ - if (!conf->verbosity) - conf->verbosity = DEFAULT_VERBOSITY; + conf->verbosity = DEFAULT_VERBOSITY; get_sys_max_fds(&conf->max_fds); conf->bindings_file = set_default(DEFAULT_BINDINGS_FILE); @@ -634,12 +633,9 @@ load_config (char * file) /* * preload default hwtable */ - if (conf->hwtable == NULL) { - conf->hwtable = vector_alloc(); - - if (!conf->hwtable) + conf->hwtable = vector_alloc(); + if (!conf->hwtable) goto out; - } if (setup_default_hwtable(conf->hwtable)) goto out; -- 2.17.0 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
