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
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 23 Sep 2020 16:27:33 +0200
|
|
Subject: [PATCH] multipathd: close pidfile on exit
|
|
|
|
It seems we've been doing this only in the failure case, for ages.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index fc1f8d7f..f6b80668 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -132,6 +132,7 @@ static pthread_cond_t config_cond;
|
|
static pthread_t check_thr, uevent_thr, uxlsnr_thr, uevq_thr, dmevent_thr;
|
|
static bool check_thr_started, uevent_thr_started, uxlsnr_thr_started,
|
|
uevq_thr_started, dmevent_thr_started;
|
|
+static int pid_fd = -1;
|
|
|
|
static inline enum daemon_status get_running_state(void)
|
|
{
|
|
@@ -2894,6 +2895,8 @@ set_oom_adj (void)
|
|
|
|
static void cleanup_pidfile(void)
|
|
{
|
|
+ if (pid_fd >= 0)
|
|
+ close(pid_fd);
|
|
condlog(3, "unlink pidfile");
|
|
unlink(DEFAULT_PIDFILE);
|
|
}
|
|
@@ -3027,7 +3030,6 @@ child (__attribute__((unused)) void *param)
|
|
pthread_attr_t log_attr, misc_attr, uevent_attr;
|
|
struct vectors * vecs;
|
|
int rc;
|
|
- int pid_fd = -1;
|
|
struct config *conf;
|
|
char *envp;
|
|
enum daemon_status state;
|