b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 23 Sep 2020 21:06:13 +0200
|
|
Subject: [PATCH] multipathd: fixup libdm deinitialization
|
|
|
|
With libmp_dm_exit() in place, we can make sure that the
|
|
calls are made in the right order.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 7ab3eab8..4c4e2eab 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -3220,8 +3220,6 @@ failed:
|
|
if (poll_dmevents)
|
|
cleanup_dmevent_waiter();
|
|
|
|
- dm_lib_exit();
|
|
-
|
|
/* We're done here */
|
|
cleanup_pidfile();
|
|
condlog(2, "--------shut down-------");
|
|
@@ -3318,6 +3316,9 @@ main (int argc, char *argv[])
|
|
|
|
pthread_cond_init_mono(&config_cond);
|
|
|
|
+ if (atexit(dm_lib_exit))
|
|
+ condlog(3, "failed to register exit handler for libdm");
|
|
+
|
|
libmultipath_init();
|
|
if (atexit(libmultipath_exit))
|
|
condlog(3, "failed to register exit handler for libmultipath");
|