From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Tue, 5 Nov 2019 12:37:58 -0600 Subject: [PATCH] libmultipath: add missing hwe mpe variable merges There were some variables in the hwe and mpe structs that weren't being merged by merge_hwe() and merge_mpe(). Signed-off-by: Benjamin Marzinski --- libmultipath/config.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libmultipath/config.c b/libmultipath/config.c index 20e3b8bf..85626e96 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -372,6 +372,10 @@ merge_hwe (struct hwentry * dst, struct hwentry * src) merge_num(san_path_err_threshold); merge_num(san_path_err_forget_rate); merge_num(san_path_err_recovery_time); + merge_num(marginal_path_err_sample_time); + merge_num(marginal_path_err_rate_threshold); + merge_num(marginal_path_err_recheck_gap_time); + merge_num(marginal_path_double_failed_time); snprintf(id, sizeof(id), "%s/%s", dst->vendor, dst->product); reconcile_features_with_options(id, &dst->features, @@ -397,6 +401,7 @@ merge_mpe(struct mpentry *dst, struct mpentry *src) if (dst->prkey_source == PRKEY_SOURCE_NONE && src->prkey_source != PRKEY_SOURCE_NONE) { dst->prkey_source = src->prkey_source; + dst->sa_flags = src->sa_flags; memcpy(&dst->reservation_key, &src->reservation_key, sizeof(dst->reservation_key)); } @@ -413,6 +418,9 @@ merge_mpe(struct mpentry *dst, struct mpentry *src) merge_num(deferred_remove); merge_num(delay_watch_checks); merge_num(delay_wait_checks); + merge_num(san_path_err_threshold); + merge_num(san_path_err_forget_rate); + merge_num(san_path_err_recovery_time); merge_num(marginal_path_err_sample_time); merge_num(marginal_path_err_rate_threshold); merge_num(marginal_path_err_recheck_gap_time); -- 2.17.2