* [PATCH 0/2] Fix recently introduced inconsistencies
@ 2018-03-19 16:23 Bart Van Assche
2018-03-19 16:23 ` [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions Bart Van Assche
2018-03-19 16:23 ` [PATCH 2/2] libmultipath: Fix recently introduced inconsistencies Bart Van Assche
0 siblings, 2 replies; 7+ messages in thread
From: Bart Van Assche @ 2018-03-19 16:23 UTC (permalink / raw)
To: Christophe Varoqui; +Cc: Bart Van Assche, Martin Wilck, dm-devel
Hello Christophe,
Analysis of recently introduced inconsistencies learned me the following:
- Not all .c files in the multipath-tools include the corresponding header
files so the compiler cannot verify consistency of declarations and
definitions for all declarations.
- A recent change of call-by-reference into call-by-value was incomplete.
This patch series addresses both issues. Please consider these patches for
the official multipath-tools repository.
Thanks,
Bart.
Bart Van Assche (2):
Allow the compiler to verify consistency of declarations and
definitions
libmultipath: Fix recently introduced inconsistencies
libmultipath/callout.c | 1 +
libmultipath/config.c | 4 ++--
libmultipath/debug.c | 1 +
libmultipath/defaults.c | 1 +
libmultipath/dict.c | 1 +
libmultipath/dict.h | 14 +++++++-------
libmultipath/dmparser.c | 1 +
libmultipath/hwtable.c | 1 +
libmultipath/propsel.c | 45 +++++++++++++++++++++++----------------------
libmultipath/propsel.h | 4 ++--
mpathpersist/main.c | 1 +
multipathd/cli_handlers.c | 1 +
multipathd/uxclnt.c | 1 +
13 files changed, 43 insertions(+), 33 deletions(-)
--
2.16.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions 2018-03-19 16:23 [PATCH 0/2] Fix recently introduced inconsistencies Bart Van Assche @ 2018-03-19 16:23 ` Bart Van Assche 2018-03-19 20:07 ` Martin Wilck 2018-05-11 18:20 ` Xose Vazquez Perez 2018-03-19 16:23 ` [PATCH 2/2] libmultipath: Fix recently introduced inconsistencies Bart Van Assche 1 sibling, 2 replies; 7+ messages in thread From: Bart Van Assche @ 2018-03-19 16:23 UTC (permalink / raw) To: Christophe Varoqui; +Cc: Bart Van Assche, Martin Wilck, dm-devel Make sure that in every source file the header file is included that declares the functions defined in that source file. This allows the compiler to detect inconsistencies between source and header files. Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> --- libmultipath/callout.c | 1 + libmultipath/debug.c | 1 + libmultipath/defaults.c | 1 + libmultipath/dict.c | 1 + libmultipath/dmparser.c | 1 + libmultipath/hwtable.c | 1 + libmultipath/propsel.c | 1 + mpathpersist/main.c | 1 + multipathd/cli_handlers.c | 1 + multipathd/uxclnt.c | 1 + 10 files changed, 10 insertions(+) diff --git a/libmultipath/callout.c b/libmultipath/callout.c index dc18e0200de8..d5ca27b1dd76 100644 --- a/libmultipath/callout.c +++ b/libmultipath/callout.c @@ -18,6 +18,7 @@ #include "vector.h" #include "structs.h" #include "util.h" +#include "callout.h" #include "debug.h" int execute_program(char *path, char *value, int len) diff --git a/libmultipath/debug.c b/libmultipath/debug.c index f95a3e5f97f5..cbf1e5701952 100644 --- a/libmultipath/debug.c +++ b/libmultipath/debug.c @@ -12,6 +12,7 @@ #include "vector.h" #include "config.h" #include "defaults.h" +#include "debug.h" void dlog (int sink, int prio, const char * fmt, ...) { diff --git a/libmultipath/defaults.c b/libmultipath/defaults.c index e66532529dae..7130e56f99c4 100644 --- a/libmultipath/defaults.c +++ b/libmultipath/defaults.c @@ -3,6 +3,7 @@ */ #include <string.h> +#include "defaults.h" #include "memory.h" char * diff --git a/libmultipath/dict.c b/libmultipath/dict.c index ea273dd91962..ac9216c4c5f3 100644 --- a/libmultipath/dict.c +++ b/libmultipath/dict.c @@ -23,6 +23,7 @@ #include <errno.h> #include <inttypes.h> #include "mpath_cmd.h" +#include "dict.h" static int set_int(vector strvec, void *ptr) diff --git a/libmultipath/dmparser.c b/libmultipath/dmparser.c index 783c934f1154..620f507dbecd 100644 --- a/libmultipath/dmparser.c +++ b/libmultipath/dmparser.c @@ -13,6 +13,7 @@ #include "structs.h" #include "util.h" #include "debug.h" +#include "dmparser.h" #define WORD_SIZE 64 diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c index fe71d1427d55..fd439ae38e87 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c @@ -7,6 +7,7 @@ #include "config.h" #include "pgpolicies.h" #include "prio.h" +#include "hwtable.h" /* * Tuning suggestions on these parameters should go to diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 58a6a42fe333..06f2fd538835 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -22,6 +22,7 @@ #include "sysfs.h" #include "prioritizers/alua_rtpg.h" #include "prkey.h" +#include "propsel.h" #include <inttypes.h> #include <libudev.h> diff --git a/mpathpersist/main.c b/mpathpersist/main.c index 79b89e5b035a..c51fa1d31db9 100644 --- a/mpathpersist/main.c +++ b/mpathpersist/main.c @@ -11,6 +11,7 @@ #include <libudev.h> #include "mpath_persist.h" #include "main.h" +#include "debug.h" #include <pthread.h> #include <ctype.h> #include <string.h> diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c index 60ec48b9904a..0de76b698013 100644 --- a/multipathd/cli_handlers.c +++ b/multipathd/cli_handlers.c @@ -28,6 +28,7 @@ #include "cli.h" #include "uevent.h" #include "foreign.h" +#include "cli_handlers.h" int show_paths (char ** r, int * len, struct vectors * vecs, char * style, diff --git a/multipathd/uxclnt.c b/multipathd/uxclnt.c index c5c32eacb380..08db0e884318 100644 --- a/multipathd/uxclnt.c +++ b/multipathd/uxclnt.c @@ -25,6 +25,7 @@ #include "vector.h" #include "cli.h" +#include "uxclnt.h" static void print_reply(char *s) { -- 2.16.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions 2018-03-19 16:23 ` [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions Bart Van Assche @ 2018-03-19 20:07 ` Martin Wilck 2018-05-11 18:20 ` Xose Vazquez Perez 1 sibling, 0 replies; 7+ messages in thread From: Martin Wilck @ 2018-03-19 20:07 UTC (permalink / raw) To: Bart Van Assche, Christophe Varoqui; +Cc: dm-devel On Mon, 2018-03-19 at 09:23 -0700, Bart Van Assche wrote: > Make sure that in every source file the header file is included that > declares the functions defined in that source file. This allows the > compiler to detect inconsistencies between source and header files. > > Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Reviewed-by: Martin Wilck <mwilck@suse.com> -- Dr. Martin Wilck <mwilck@suse.com>, Tel. +49 (0)911 74053 2107 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions 2018-03-19 16:23 ` [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions Bart Van Assche 2018-03-19 20:07 ` Martin Wilck @ 2018-05-11 18:20 ` Xose Vazquez Perez 1 sibling, 0 replies; 7+ messages in thread From: Xose Vazquez Perez @ 2018-05-11 18:20 UTC (permalink / raw) To: Bart Van Assche, Christophe Varoqui; +Cc: dm-devel, Martin Wilck On 03/19/2018 05:23 PM, Bart Van Assche wrote: > Make sure that in every source file the header file is included that > declares the functions defined in that source file. This allows the > compiler to detect inconsistencies between source and header files. A header sanitizing could be done with iwyu: https://include-what-you-use.org/ ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] libmultipath: Fix recently introduced inconsistencies 2018-03-19 16:23 [PATCH 0/2] Fix recently introduced inconsistencies Bart Van Assche 2018-03-19 16:23 ` [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions Bart Van Assche @ 2018-03-19 16:23 ` Bart Van Assche 2018-03-19 20:23 ` Martin Wilck 2018-03-19 20:27 ` [PATCH v2 " Martin Wilck 1 sibling, 2 replies; 7+ messages in thread From: Bart Van Assche @ 2018-03-19 16:23 UTC (permalink / raw) To: Christophe Varoqui; +Cc: Bart Van Assche, Martin Wilck, dm-devel Commit 48e9fd9f67bb changed libmultipath such that an int is passed as the second argument to some print_*() calls and a pointer to other print_*() calls. Fix these inconsistencies by changing all call-by-reference calls into call-by-value calls. Fixes: 48e9fd9f67bb ("libmultipath: parser: use call-by-value for "snprint" methods") Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Martin Wilck <mwilck@suse.com> --- libmultipath/config.c | 4 ++-- libmultipath/dict.h | 14 +++++++------- libmultipath/propsel.c | 44 ++++++++++++++++++++++---------------------- libmultipath/propsel.h | 4 ++-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index 085a3e12d0a0..a4343b95172c 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -355,8 +355,8 @@ merge_hwe (struct hwentry * dst, struct hwentry * src) snprintf(id, sizeof(id), "%s/%s", dst->vendor, dst->product); reconcile_features_with_options(id, &dst->features, - &dst->no_path_retry, - &dst->retain_hwhandler); + dst->no_path_retry, + dst->retain_hwhandler); return 0; } diff --git a/libmultipath/dict.h b/libmultipath/dict.h index 044222736de7..756489217cff 100644 --- a/libmultipath/dict.h +++ b/libmultipath/dict.h @@ -9,12 +9,12 @@ void init_keywords(vector keywords); int get_sys_max_fds(int *); -int print_rr_weight (char * buff, int len, void *ptr); -int print_pgfailback (char * buff, int len, void *ptr); -int print_pgpolicy(char * buff, int len, void *ptr); -int print_no_path_retry(char * buff, int len, void *ptr); -int print_fast_io_fail(char * buff, int len, void *ptr); -int print_dev_loss(char * buff, int len, void *ptr); +int print_rr_weight(char *buff, int len, long v); +int print_pgfailback(char *buff, int len, long v); +int print_pgpolicy(char *buff, int len, long v); +int print_no_path_retry(char *buff, int len, long v); +int print_fast_io_fail(char *buff, int len, long v); +int print_dev_loss(char *buff, int len, unsigned long v); int print_reservation_key(char * buff, int len, struct be64 key, int source); -int print_off_int_undef(char * buff, int len, void *ptr); +int print_off_int_undef(char *buff, int len, long v); #endif /* _DICT_H */ diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 06f2fd538835..683fefd94dee 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -150,7 +150,7 @@ int select_rr_weight(struct config *conf, struct multipath * mp) mp_set_conf(rr_weight); mp_set_default(rr_weight, DEFAULT_RR_WEIGHT); out: - print_rr_weight(buff, 13, &mp->rr_weight); + print_rr_weight(buff, 13, mp->rr_weight); condlog(3, "%s: rr_weight = %s %s", mp->alias, buff, origin); return 0; } @@ -165,7 +165,7 @@ int select_pgfailback(struct config *conf, struct multipath * mp) mp_set_conf(pgfailback); mp_set_default(pgfailback, DEFAULT_FAILBACK); out: - print_pgfailback(buff, 13, &mp->pgfailback); + print_pgfailback(buff, 13, mp->pgfailback); condlog(3, "%s: failback = %s %s", mp->alias, buff, origin); return 0; } @@ -283,8 +283,8 @@ out: return mp->alias ? 0 : 1; } -void reconcile_features_with_options(const char *id, char **features, int* no_path_retry, - int *retain_hwhandler) +void reconcile_features_with_options(const char *id, char **features, int no_path_retry, + int retain_hwhandler) { static const char q_i_n_p[] = "queue_if_no_path"; static const char r_a_h_h[] = "retain_attached_hw_handler"; @@ -307,15 +307,15 @@ void reconcile_features_with_options(const char *id, char **features, int* no_pa condlog(0, "%s: option 'features \"1 %s\"' is deprecated, " "please use 'no_path_retry queue' instead", id, q_i_n_p); - if (*no_path_retry == NO_PATH_RETRY_UNDEF) { - *no_path_retry = NO_PATH_RETRY_QUEUE; + if (no_path_retry == NO_PATH_RETRY_UNDEF) { + no_path_retry = NO_PATH_RETRY_QUEUE; print_no_path_retry(buff, sizeof(buff), no_path_retry); condlog(3, "%s: no_path_retry = %s (inherited setting from feature '%s')", id, buff, q_i_n_p); }; /* Warn only if features string is overridden */ - if (*no_path_retry != NO_PATH_RETRY_QUEUE) { + if (no_path_retry != NO_PATH_RETRY_QUEUE) { print_no_path_retry(buff, sizeof(buff), no_path_retry); condlog(2, "%s: ignoring feature '%s' because no_path_retry is set to '%s'", @@ -326,11 +326,11 @@ void reconcile_features_with_options(const char *id, char **features, int* no_pa if (strstr(*features, r_a_h_h)) { condlog(0, "%s: option 'features \"1 %s\"' is deprecated", id, r_a_h_h); - if (*retain_hwhandler == RETAIN_HWHANDLER_UNDEF) { + if (retain_hwhandler == RETAIN_HWHANDLER_UNDEF) { condlog(3, "%s: %s = on (inherited setting from feature '%s')", id, r_a_h_h, r_a_h_h); - *retain_hwhandler = RETAIN_HWHANDLER_ON; - } else if (*retain_hwhandler == RETAIN_HWHANDLER_OFF) + retain_hwhandler = RETAIN_HWHANDLER_ON; + } else if (retain_hwhandler == RETAIN_HWHANDLER_OFF) condlog(2, "%s: ignoring feature '%s' because %s is set to 'off'", id, r_a_h_h, r_a_h_h); remove_feature(features, r_a_h_h); @@ -350,8 +350,8 @@ out: mp->features = STRDUP(mp->features); reconcile_features_with_options(mp->alias, &mp->features, - &mp->no_path_retry, - &mp->retain_hwhandler); + mp->no_path_retry, + mp->retain_hwhandler); condlog(3, "%s: features = \"%s\" %s", mp->alias, mp->features, origin); return 0; } @@ -566,7 +566,7 @@ int select_no_path_retry(struct config *conf, struct multipath *mp) mp_set_hwe(no_path_retry); mp_set_conf(no_path_retry); out: - print_no_path_retry(buff, 12, &mp->no_path_retry); + print_no_path_retry(buff, 12, mp->no_path_retry); if (origin) condlog(3, "%s: no_path_retry = %s %s", mp->alias, buff, origin); @@ -625,7 +625,7 @@ int select_fast_io_fail(struct config *conf, struct multipath *mp) mp_set_conf(fast_io_fail); mp_set_default(fast_io_fail, DEFAULT_FAST_IO_FAIL); out: - print_fast_io_fail(buff, 12, &mp->fast_io_fail); + print_fast_io_fail(buff, 12, mp->fast_io_fail); condlog(3, "%s: fast_io_fail_tmo = %s %s", mp->alias, buff, origin); return 0; } @@ -640,7 +640,7 @@ int select_dev_loss(struct config *conf, struct multipath *mp) mp->dev_loss = 0; return 0; out: - print_dev_loss(buff, 12, &mp->dev_loss); + print_dev_loss(buff, 12, mp->dev_loss); condlog(3, "%s: dev_loss_tmo = %s %s", mp->alias, buff, origin); return 0; } @@ -776,7 +776,7 @@ int select_delay_watch_checks(struct config *conf, struct multipath *mp) mp_set_conf(delay_watch_checks); mp_set_default(delay_watch_checks, DEFAULT_DELAY_CHECKS); out: - print_off_int_undef(buff, 12, &mp->delay_watch_checks); + print_off_int_undef(buff, 12, mp->delay_watch_checks); condlog(3, "%s: delay_watch_checks = %s %s", mp->alias, buff, origin); return 0; } @@ -791,7 +791,7 @@ int select_delay_wait_checks(struct config *conf, struct multipath *mp) mp_set_conf(delay_wait_checks); mp_set_default(delay_wait_checks, DEFAULT_DELAY_CHECKS); out: - print_off_int_undef(buff, 12, &mp->delay_wait_checks); + print_off_int_undef(buff, 12, mp->delay_wait_checks); condlog(3, "%s: delay_wait_checks = %s %s", mp->alias, buff, origin); return 0; @@ -807,7 +807,7 @@ int select_marginal_path_err_sample_time(struct config *conf, struct multipath * mp_set_conf(marginal_path_err_sample_time); mp_set_default(marginal_path_err_sample_time, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_err_sample_time); + print_off_int_undef(buff, 12, mp->marginal_path_err_sample_time); condlog(3, "%s: marginal_path_err_sample_time = %s %s", mp->alias, buff, origin); return 0; @@ -823,7 +823,7 @@ int select_marginal_path_err_rate_threshold(struct config *conf, struct multipat mp_set_conf(marginal_path_err_rate_threshold); mp_set_default(marginal_path_err_rate_threshold, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_err_rate_threshold); + print_off_int_undef(buff, 12, mp->marginal_path_err_rate_threshold); condlog(3, "%s: marginal_path_err_rate_threshold = %s %s", mp->alias, buff, origin); return 0; @@ -839,7 +839,7 @@ int select_marginal_path_err_recheck_gap_time(struct config *conf, struct multip mp_set_conf(marginal_path_err_recheck_gap_time); mp_set_default(marginal_path_err_recheck_gap_time, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_err_recheck_gap_time); + print_off_int_undef(buff, 12, mp->marginal_path_err_recheck_gap_time); condlog(3, "%s: marginal_path_err_recheck_gap_time = %s %s", mp->alias, buff, origin); return 0; @@ -855,7 +855,7 @@ int select_marginal_path_double_failed_time(struct config *conf, struct multipat mp_set_conf(marginal_path_double_failed_time); mp_set_default(marginal_path_double_failed_time, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_double_failed_time); + print_off_int_undef(buff, 12, mp->marginal_path_double_failed_time); condlog(3, "%s: marginal_path_double_failed_time = %s %s", mp->alias, buff, origin); return 0; @@ -908,7 +908,7 @@ int select_ghost_delay (struct config *conf, struct multipath * mp) mp_set_conf(ghost_delay); mp_set_default(ghost_delay, DEFAULT_GHOST_DELAY); out: - print_off_int_undef(buff, 12, &mp->ghost_delay); + print_off_int_undef(buff, 12, mp->ghost_delay); condlog(3, "%s: ghost_delay = %s %s", mp->alias, buff, origin); return 0; } diff --git a/libmultipath/propsel.h b/libmultipath/propsel.h index 136f90605b91..ab7c358035bb 100644 --- a/libmultipath/propsel.h +++ b/libmultipath/propsel.h @@ -31,5 +31,5 @@ int select_marginal_path_err_recheck_gap_time(struct config *conf, struct multip int select_marginal_path_double_failed_time(struct config *conf, struct multipath *mp); int select_ghost_delay(struct config *conf, struct multipath * mp); void reconcile_features_with_options(const char *id, char **features, - int* no_path_retry, - int *retain_hwhandler); + int no_path_retry, + int retain_hwhandler); -- 2.16.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] libmultipath: Fix recently introduced inconsistencies 2018-03-19 16:23 ` [PATCH 2/2] libmultipath: Fix recently introduced inconsistencies Bart Van Assche @ 2018-03-19 20:23 ` Martin Wilck 2018-03-19 20:27 ` [PATCH v2 " Martin Wilck 1 sibling, 0 replies; 7+ messages in thread From: Martin Wilck @ 2018-03-19 20:23 UTC (permalink / raw) To: Bart Van Assche, Christophe Varoqui; +Cc: dm-devel On Mon, 2018-03-19 at 09:23 -0700, Bart Van Assche wrote: > Commit 48e9fd9f67bb changed libmultipath such that an int is passed > as the second argument to some print_*() calls and a pointer to > other print_*() calls. Fix these inconsistencies by changing all > call-by-reference calls into call-by-value calls. > > Fixes: 48e9fd9f67bb ("libmultipath: parser: use call-by-value for > "snprint" methods") > Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> > Cc: Martin Wilck <mwilck@suse.com> Hi Bart, thanks a lot for spotting this, but NACK for the reconcile_features_with_options() part. This function is allowed to change its no_path_retry and retain_hwhandler arguments. Please change just the calls to print_no_path_retry() in that function. Regards Martin > --- > libmultipath/config.c | 4 ++-- > libmultipath/dict.h | 14 +++++++------- > libmultipath/propsel.c | 44 ++++++++++++++++++++++---------------- > ------ > libmultipath/propsel.h | 4 ++-- > 4 files changed, 33 insertions(+), 33 deletions(-) > > diff --git a/libmultipath/config.c b/libmultipath/config.c > index 085a3e12d0a0..a4343b95172c 100644 > --- a/libmultipath/config.c > +++ b/libmultipath/config.c > @@ -355,8 +355,8 @@ merge_hwe (struct hwentry * dst, struct hwentry * > src) > > snprintf(id, sizeof(id), "%s/%s", dst->vendor, dst- > >product); > reconcile_features_with_options(id, &dst->features, > - &dst->no_path_retry, > - &dst->retain_hwhandler); > + dst->no_path_retry, > + dst->retain_hwhandler); > return 0; > } > > diff --git a/libmultipath/dict.h b/libmultipath/dict.h > index 044222736de7..756489217cff 100644 > --- a/libmultipath/dict.h > +++ b/libmultipath/dict.h > @@ -9,12 +9,12 @@ > > void init_keywords(vector keywords); > int get_sys_max_fds(int *); > -int print_rr_weight (char * buff, int len, void *ptr); > -int print_pgfailback (char * buff, int len, void *ptr); > -int print_pgpolicy(char * buff, int len, void *ptr); > -int print_no_path_retry(char * buff, int len, void *ptr); > -int print_fast_io_fail(char * buff, int len, void *ptr); > -int print_dev_loss(char * buff, int len, void *ptr); > +int print_rr_weight(char *buff, int len, long v); > +int print_pgfailback(char *buff, int len, long v); > +int print_pgpolicy(char *buff, int len, long v); > +int print_no_path_retry(char *buff, int len, long v); > +int print_fast_io_fail(char *buff, int len, long v); > +int print_dev_loss(char *buff, int len, unsigned long v); > int print_reservation_key(char * buff, int len, struct be64 key, int > source); > -int print_off_int_undef(char * buff, int len, void *ptr); > +int print_off_int_undef(char *buff, int len, long v); > #endif /* _DICT_H */ > diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c > index 06f2fd538835..683fefd94dee 100644 > --- a/libmultipath/propsel.c > +++ b/libmultipath/propsel.c > @@ -150,7 +150,7 @@ int select_rr_weight(struct config *conf, struct > multipath * mp) > mp_set_conf(rr_weight); > mp_set_default(rr_weight, DEFAULT_RR_WEIGHT); > out: > - print_rr_weight(buff, 13, &mp->rr_weight); > + print_rr_weight(buff, 13, mp->rr_weight); > condlog(3, "%s: rr_weight = %s %s", mp->alias, buff, > origin); > return 0; > } > @@ -165,7 +165,7 @@ int select_pgfailback(struct config *conf, struct > multipath * mp) > mp_set_conf(pgfailback); > mp_set_default(pgfailback, DEFAULT_FAILBACK); > out: > - print_pgfailback(buff, 13, &mp->pgfailback); > + print_pgfailback(buff, 13, mp->pgfailback); > condlog(3, "%s: failback = %s %s", mp->alias, buff, origin); > return 0; > } > @@ -283,8 +283,8 @@ out: > return mp->alias ? 0 : 1; > } > > -void reconcile_features_with_options(const char *id, char > **features, int* no_path_retry, > - int *retain_hwhandler) > +void reconcile_features_with_options(const char *id, char > **features, int no_path_retry, > + int retain_hwhandler) > { > static const char q_i_n_p[] = "queue_if_no_path"; > static const char r_a_h_h[] = "retain_attached_hw_handler"; > @@ -307,15 +307,15 @@ void reconcile_features_with_options(const char > *id, char **features, int* no_pa > condlog(0, "%s: option 'features \"1 %s\"' is > deprecated, " > "please use 'no_path_retry queue' instead", > id, q_i_n_p); > - if (*no_path_retry == NO_PATH_RETRY_UNDEF) { > - *no_path_retry = NO_PATH_RETRY_QUEUE; > + if (no_path_retry == NO_PATH_RETRY_UNDEF) { > + no_path_retry = NO_PATH_RETRY_QUEUE; > print_no_path_retry(buff, sizeof(buff), > no_path_retry); > condlog(3, "%s: no_path_retry = %s > (inherited setting from feature '%s')", > id, buff, q_i_n_p); > }; > /* Warn only if features string is overridden */ > - if (*no_path_retry != NO_PATH_RETRY_QUEUE) { > + if (no_path_retry != NO_PATH_RETRY_QUEUE) { > print_no_path_retry(buff, sizeof(buff), > no_path_retry); > condlog(2, "%s: ignoring feature '%s' > because no_path_retry is set to '%s'", > @@ -326,11 +326,11 @@ void reconcile_features_with_options(const char > *id, char **features, int* no_pa > if (strstr(*features, r_a_h_h)) { > condlog(0, "%s: option 'features \"1 %s\"' is > deprecated", > id, r_a_h_h); > - if (*retain_hwhandler == RETAIN_HWHANDLER_UNDEF) { > + if (retain_hwhandler == RETAIN_HWHANDLER_UNDEF) { > condlog(3, "%s: %s = on (inherited setting > from feature '%s')", > id, r_a_h_h, r_a_h_h); > - *retain_hwhandler = RETAIN_HWHANDLER_ON; > - } else if (*retain_hwhandler == > RETAIN_HWHANDLER_OFF) > + retain_hwhandler = RETAIN_HWHANDLER_ON; > + } else if (retain_hwhandler == RETAIN_HWHANDLER_OFF) > condlog(2, "%s: ignoring feature '%s' > because %s is set to 'off'", > id, r_a_h_h, r_a_h_h); > remove_feature(features, r_a_h_h); > @@ -350,8 +350,8 @@ out: > mp->features = STRDUP(mp->features); > > reconcile_features_with_options(mp->alias, &mp->features, > - &mp->no_path_retry, > - &mp->retain_hwhandler); > + mp->no_path_retry, > + mp->retain_hwhandler); > condlog(3, "%s: features = \"%s\" %s", mp->alias, mp- > >features, origin); > return 0; > } > @@ -566,7 +566,7 @@ int select_no_path_retry(struct config *conf, > struct multipath *mp) > mp_set_hwe(no_path_retry); > mp_set_conf(no_path_retry); > out: > - print_no_path_retry(buff, 12, &mp->no_path_retry); > + print_no_path_retry(buff, 12, mp->no_path_retry); > if (origin) > condlog(3, "%s: no_path_retry = %s %s", mp->alias, > buff, > origin); > @@ -625,7 +625,7 @@ int select_fast_io_fail(struct config *conf, > struct multipath *mp) > mp_set_conf(fast_io_fail); > mp_set_default(fast_io_fail, DEFAULT_FAST_IO_FAIL); > out: > - print_fast_io_fail(buff, 12, &mp->fast_io_fail); > + print_fast_io_fail(buff, 12, mp->fast_io_fail); > condlog(3, "%s: fast_io_fail_tmo = %s %s", mp->alias, buff, > origin); > return 0; > } > @@ -640,7 +640,7 @@ int select_dev_loss(struct config *conf, struct > multipath *mp) > mp->dev_loss = 0; > return 0; > out: > - print_dev_loss(buff, 12, &mp->dev_loss); > + print_dev_loss(buff, 12, mp->dev_loss); > condlog(3, "%s: dev_loss_tmo = %s %s", mp->alias, buff, > origin); > return 0; > } > @@ -776,7 +776,7 @@ int select_delay_watch_checks(struct config > *conf, struct multipath *mp) > mp_set_conf(delay_watch_checks); > mp_set_default(delay_watch_checks, DEFAULT_DELAY_CHECKS); > out: > - print_off_int_undef(buff, 12, &mp->delay_watch_checks); > + print_off_int_undef(buff, 12, mp->delay_watch_checks); > condlog(3, "%s: delay_watch_checks = %s %s", mp->alias, > buff, origin); > return 0; > } > @@ -791,7 +791,7 @@ int select_delay_wait_checks(struct config *conf, > struct multipath *mp) > mp_set_conf(delay_wait_checks); > mp_set_default(delay_wait_checks, DEFAULT_DELAY_CHECKS); > out: > - print_off_int_undef(buff, 12, &mp->delay_wait_checks); > + print_off_int_undef(buff, 12, mp->delay_wait_checks); > condlog(3, "%s: delay_wait_checks = %s %s", mp->alias, buff, > origin); > return 0; > > @@ -807,7 +807,7 @@ int select_marginal_path_err_sample_time(struct > config *conf, struct multipath * > mp_set_conf(marginal_path_err_sample_time); > mp_set_default(marginal_path_err_sample_time, > DEFAULT_ERR_CHECKS); > out: > - print_off_int_undef(buff, 12, &mp- > >marginal_path_err_sample_time); > + print_off_int_undef(buff, 12, mp- > >marginal_path_err_sample_time); > condlog(3, "%s: marginal_path_err_sample_time = %s %s", mp- > >alias, buff, > origin); > return 0; > @@ -823,7 +823,7 @@ int > select_marginal_path_err_rate_threshold(struct config *conf, struct > multipat > mp_set_conf(marginal_path_err_rate_threshold); > mp_set_default(marginal_path_err_rate_threshold, > DEFAULT_ERR_CHECKS); > out: > - print_off_int_undef(buff, 12, &mp- > >marginal_path_err_rate_threshold); > + print_off_int_undef(buff, 12, mp- > >marginal_path_err_rate_threshold); > condlog(3, "%s: marginal_path_err_rate_threshold = %s %s", > mp->alias, buff, > origin); > return 0; > @@ -839,7 +839,7 @@ int > select_marginal_path_err_recheck_gap_time(struct config *conf, struct > multip > mp_set_conf(marginal_path_err_recheck_gap_time); > mp_set_default(marginal_path_err_recheck_gap_time, > DEFAULT_ERR_CHECKS); > out: > - print_off_int_undef(buff, 12, &mp- > >marginal_path_err_recheck_gap_time); > + print_off_int_undef(buff, 12, mp- > >marginal_path_err_recheck_gap_time); > condlog(3, "%s: marginal_path_err_recheck_gap_time = %s %s", > mp->alias, buff, > origin); > return 0; > @@ -855,7 +855,7 @@ int > select_marginal_path_double_failed_time(struct config *conf, struct > multipat > mp_set_conf(marginal_path_double_failed_time); > mp_set_default(marginal_path_double_failed_time, > DEFAULT_ERR_CHECKS); > out: > - print_off_int_undef(buff, 12, &mp- > >marginal_path_double_failed_time); > + print_off_int_undef(buff, 12, mp- > >marginal_path_double_failed_time); > condlog(3, "%s: marginal_path_double_failed_time = %s %s", > mp->alias, buff, > origin); > return 0; > @@ -908,7 +908,7 @@ int select_ghost_delay (struct config *conf, > struct multipath * mp) > mp_set_conf(ghost_delay); > mp_set_default(ghost_delay, DEFAULT_GHOST_DELAY); > out: > - print_off_int_undef(buff, 12, &mp->ghost_delay); > + print_off_int_undef(buff, 12, mp->ghost_delay); > condlog(3, "%s: ghost_delay = %s %s", mp->alias, buff, > origin); > return 0; > } > diff --git a/libmultipath/propsel.h b/libmultipath/propsel.h > index 136f90605b91..ab7c358035bb 100644 > --- a/libmultipath/propsel.h > +++ b/libmultipath/propsel.h > @@ -31,5 +31,5 @@ int > select_marginal_path_err_recheck_gap_time(struct config *conf, struct > multip > int select_marginal_path_double_failed_time(struct config *conf, > struct multipath *mp); > int select_ghost_delay(struct config *conf, struct multipath * mp); > void reconcile_features_with_options(const char *id, char > **features, > - int* no_path_retry, > - int *retain_hwhandler); > + int no_path_retry, > + int retain_hwhandler); -- Dr. Martin Wilck <mwilck@suse.com>, Tel. +49 (0)911 74053 2107 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] libmultipath: Fix recently introduced inconsistencies 2018-03-19 16:23 ` [PATCH 2/2] libmultipath: Fix recently introduced inconsistencies Bart Van Assche 2018-03-19 20:23 ` Martin Wilck @ 2018-03-19 20:27 ` Martin Wilck 1 sibling, 0 replies; 7+ messages in thread From: Martin Wilck @ 2018-03-19 20:27 UTC (permalink / raw) To: Christophe Varoqui, Bart Van Assche Cc: Bart Van Assche, Martin Wilck, dm-devel From: Bart Van Assche <bart.vanassche@wdc.com> Commit 48e9fd9f67bb changed libmultipath such that an int is passed as the second argument to some print_*() calls and a pointer to other print_*() calls. Fix these inconsistencies by changing all call-by-reference calls into call-by-value calls. Fixes: 48e9fd9f67bb ("libmultipath: parser: use call-by-value for "snprint" methods") Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Martin Wilck <mwilck@suse.com> Signed-off-by: Martin Wilck <mwilck@suse.com> --- libmultipath/dict.h | 14 +++++++------- libmultipath/propsel.c | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libmultipath/dict.h b/libmultipath/dict.h index 044222736de7..756489217cff 100644 --- a/libmultipath/dict.h +++ b/libmultipath/dict.h @@ -9,12 +9,12 @@ void init_keywords(vector keywords); int get_sys_max_fds(int *); -int print_rr_weight (char * buff, int len, void *ptr); -int print_pgfailback (char * buff, int len, void *ptr); -int print_pgpolicy(char * buff, int len, void *ptr); -int print_no_path_retry(char * buff, int len, void *ptr); -int print_fast_io_fail(char * buff, int len, void *ptr); -int print_dev_loss(char * buff, int len, void *ptr); +int print_rr_weight(char *buff, int len, long v); +int print_pgfailback(char *buff, int len, long v); +int print_pgpolicy(char *buff, int len, long v); +int print_no_path_retry(char *buff, int len, long v); +int print_fast_io_fail(char *buff, int len, long v); +int print_dev_loss(char *buff, int len, unsigned long v); int print_reservation_key(char * buff, int len, struct be64 key, int source); -int print_off_int_undef(char * buff, int len, void *ptr); +int print_off_int_undef(char *buff, int len, long v); #endif /* _DICT_H */ diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 06f2fd538835..93974a482336 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -150,7 +150,7 @@ int select_rr_weight(struct config *conf, struct multipath * mp) mp_set_conf(rr_weight); mp_set_default(rr_weight, DEFAULT_RR_WEIGHT); out: - print_rr_weight(buff, 13, &mp->rr_weight); + print_rr_weight(buff, 13, mp->rr_weight); condlog(3, "%s: rr_weight = %s %s", mp->alias, buff, origin); return 0; } @@ -165,7 +165,7 @@ int select_pgfailback(struct config *conf, struct multipath * mp) mp_set_conf(pgfailback); mp_set_default(pgfailback, DEFAULT_FAILBACK); out: - print_pgfailback(buff, 13, &mp->pgfailback); + print_pgfailback(buff, 13, mp->pgfailback); condlog(3, "%s: failback = %s %s", mp->alias, buff, origin); return 0; } @@ -310,14 +310,14 @@ void reconcile_features_with_options(const char *id, char **features, int* no_pa if (*no_path_retry == NO_PATH_RETRY_UNDEF) { *no_path_retry = NO_PATH_RETRY_QUEUE; print_no_path_retry(buff, sizeof(buff), - no_path_retry); + *no_path_retry); condlog(3, "%s: no_path_retry = %s (inherited setting from feature '%s')", id, buff, q_i_n_p); }; /* Warn only if features string is overridden */ if (*no_path_retry != NO_PATH_RETRY_QUEUE) { print_no_path_retry(buff, sizeof(buff), - no_path_retry); + *no_path_retry); condlog(2, "%s: ignoring feature '%s' because no_path_retry is set to '%s'", id, q_i_n_p, buff); } @@ -566,7 +566,7 @@ int select_no_path_retry(struct config *conf, struct multipath *mp) mp_set_hwe(no_path_retry); mp_set_conf(no_path_retry); out: - print_no_path_retry(buff, 12, &mp->no_path_retry); + print_no_path_retry(buff, 12, mp->no_path_retry); if (origin) condlog(3, "%s: no_path_retry = %s %s", mp->alias, buff, origin); @@ -625,7 +625,7 @@ int select_fast_io_fail(struct config *conf, struct multipath *mp) mp_set_conf(fast_io_fail); mp_set_default(fast_io_fail, DEFAULT_FAST_IO_FAIL); out: - print_fast_io_fail(buff, 12, &mp->fast_io_fail); + print_fast_io_fail(buff, 12, mp->fast_io_fail); condlog(3, "%s: fast_io_fail_tmo = %s %s", mp->alias, buff, origin); return 0; } @@ -640,7 +640,7 @@ int select_dev_loss(struct config *conf, struct multipath *mp) mp->dev_loss = 0; return 0; out: - print_dev_loss(buff, 12, &mp->dev_loss); + print_dev_loss(buff, 12, mp->dev_loss); condlog(3, "%s: dev_loss_tmo = %s %s", mp->alias, buff, origin); return 0; } @@ -776,7 +776,7 @@ int select_delay_watch_checks(struct config *conf, struct multipath *mp) mp_set_conf(delay_watch_checks); mp_set_default(delay_watch_checks, DEFAULT_DELAY_CHECKS); out: - print_off_int_undef(buff, 12, &mp->delay_watch_checks); + print_off_int_undef(buff, 12, mp->delay_watch_checks); condlog(3, "%s: delay_watch_checks = %s %s", mp->alias, buff, origin); return 0; } @@ -791,7 +791,7 @@ int select_delay_wait_checks(struct config *conf, struct multipath *mp) mp_set_conf(delay_wait_checks); mp_set_default(delay_wait_checks, DEFAULT_DELAY_CHECKS); out: - print_off_int_undef(buff, 12, &mp->delay_wait_checks); + print_off_int_undef(buff, 12, mp->delay_wait_checks); condlog(3, "%s: delay_wait_checks = %s %s", mp->alias, buff, origin); return 0; @@ -807,7 +807,7 @@ int select_marginal_path_err_sample_time(struct config *conf, struct multipath * mp_set_conf(marginal_path_err_sample_time); mp_set_default(marginal_path_err_sample_time, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_err_sample_time); + print_off_int_undef(buff, 12, mp->marginal_path_err_sample_time); condlog(3, "%s: marginal_path_err_sample_time = %s %s", mp->alias, buff, origin); return 0; @@ -823,7 +823,7 @@ int select_marginal_path_err_rate_threshold(struct config *conf, struct multipat mp_set_conf(marginal_path_err_rate_threshold); mp_set_default(marginal_path_err_rate_threshold, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_err_rate_threshold); + print_off_int_undef(buff, 12, mp->marginal_path_err_rate_threshold); condlog(3, "%s: marginal_path_err_rate_threshold = %s %s", mp->alias, buff, origin); return 0; @@ -839,7 +839,7 @@ int select_marginal_path_err_recheck_gap_time(struct config *conf, struct multip mp_set_conf(marginal_path_err_recheck_gap_time); mp_set_default(marginal_path_err_recheck_gap_time, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_err_recheck_gap_time); + print_off_int_undef(buff, 12, mp->marginal_path_err_recheck_gap_time); condlog(3, "%s: marginal_path_err_recheck_gap_time = %s %s", mp->alias, buff, origin); return 0; @@ -855,7 +855,7 @@ int select_marginal_path_double_failed_time(struct config *conf, struct multipat mp_set_conf(marginal_path_double_failed_time); mp_set_default(marginal_path_double_failed_time, DEFAULT_ERR_CHECKS); out: - print_off_int_undef(buff, 12, &mp->marginal_path_double_failed_time); + print_off_int_undef(buff, 12, mp->marginal_path_double_failed_time); condlog(3, "%s: marginal_path_double_failed_time = %s %s", mp->alias, buff, origin); return 0; @@ -908,7 +908,7 @@ int select_ghost_delay (struct config *conf, struct multipath * mp) mp_set_conf(ghost_delay); mp_set_default(ghost_delay, DEFAULT_GHOST_DELAY); out: - print_off_int_undef(buff, 12, &mp->ghost_delay); + print_off_int_undef(buff, 12, mp->ghost_delay); condlog(3, "%s: ghost_delay = %s %s", mp->alias, buff, origin); return 0; } -- 2.16.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-05-11 18:20 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-03-19 16:23 [PATCH 0/2] Fix recently introduced inconsistencies Bart Van Assche 2018-03-19 16:23 ` [PATCH 1/2] Allow the compiler to verify consistency of declarations and definitions Bart Van Assche 2018-03-19 20:07 ` Martin Wilck 2018-05-11 18:20 ` Xose Vazquez Perez 2018-03-19 16:23 ` [PATCH 2/2] libmultipath: Fix recently introduced inconsistencies Bart Van Assche 2018-03-19 20:23 ` Martin Wilck 2018-03-19 20:27 ` [PATCH v2 " Martin Wilck
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.