From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martin Wilck 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 Signed-off-by: Benjamin Marzinski --- 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; -- 2.17.2