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