c79ce3480d
Update Source to latest upstream commit
* Previous patches 0001-0018 are included in this commit
Rename files
* Previous patches 0019-0028 are now patches 0002-0003 & 0012-0019
Add 0001-libmultipath-remove-last-of-rbd-code.patch
Add 0004-mpathpersist-add-param-alltgpt-option.patch
* mpathpersist now accepts --param-alltgpt
Add 0005-libmutipath-remove-unused-IDE-bus-type.patch
Add 0006-multipathd-add-new-protocol-path-wildcard.patch
* multipathd show paths format now accepts %P for the path
* protocol/transport
Add 0007-libmultipath-add-protocol-blacklist-option.patch
* You can now use the "protocol" blacklist section parameter to
* blacklist
by protocol/transport
Add 0008-libmultipath-remove-_filter_-blacklist-functions.patch
Add 0009-multipath-tests-change-to-work-with-old-make-version.patch
Add 0010-multipath-tests-add-blacklist-tests.patch
Add 0011-mpathpersist-add-missing-param-rk-usage-info.patch
Refresh 0013-RH-Remove-the-property-blacklist-exception-builtin.patch
Modify 0016-RH-add-mpathconf.patch
* improve usage message and man page
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 8 Jun 2018 17:23:07 -0500
|
|
Subject: [PATCH] multipath: fix setting conf->version
|
|
|
|
Commit d3b71498 stopped multipath from setting conf->version. Instead,
|
|
it was always being set to 0.0.0. Multipathd was still setting this
|
|
correctly.
|
|
|
|
Fixes: d3b71498 "multipath: fix rcu thread cancellation hang"
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/devmapper.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
|
|
index f2befad..8136d15 100644
|
|
--- a/libmultipath/devmapper.c
|
|
+++ b/libmultipath/devmapper.c
|
|
@@ -245,13 +245,13 @@ void libmp_dm_init(void)
|
|
int verbosity;
|
|
unsigned int version[3];
|
|
|
|
+ if (dm_prereq(version))
|
|
+ exit(1);
|
|
conf = get_multipath_config();
|
|
verbosity = conf->verbosity;
|
|
- memcpy(version, conf->version, sizeof(version));
|
|
+ memcpy(conf->version, version, sizeof(version));
|
|
put_multipath_config(conf);
|
|
dm_init(verbosity);
|
|
- if (dm_prereq(version))
|
|
- exit(1);
|
|
dm_udev_set_sync_support(libmp_dm_udev_sync);
|
|
}
|
|
|
|
--
|
|
2.7.4
|
|
|