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
58 lines
1.2 KiB
Diff
58 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 23 Sep 2020 17:49:02 +0200
|
|
Subject: [PATCH] multipathd: add helper for systemd notification at exit
|
|
|
|
Add sd_notify_exit().
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 22 +++++++++++++---------
|
|
1 file changed, 13 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index f6b80668..07068e4a 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -3024,6 +3024,17 @@ static void cleanup_rcu(void)
|
|
rcu_unregister_thread();
|
|
}
|
|
|
|
+static int sd_notify_exit(int err)
|
|
+{
|
|
+#ifdef USE_SYSTEMD
|
|
+ char msg[24];
|
|
+
|
|
+ snprintf(msg, sizeof(msg), "ERRNO=%d", err);
|
|
+ sd_notify(0, msg);
|
|
+#endif
|
|
+ return err;
|
|
+}
|
|
+
|
|
static int
|
|
child (__attribute__((unused)) void *param)
|
|
{
|
|
@@ -3216,19 +3227,12 @@ child (__attribute__((unused)) void *param)
|
|
#ifdef _DEBUG_
|
|
dbg_free_final(NULL);
|
|
#endif
|
|
-
|
|
-#ifdef USE_SYSTEMD
|
|
- sd_notify(0, "ERRNO=0");
|
|
-#endif
|
|
- exit(0);
|
|
+ exit(sd_notify_exit(0));
|
|
|
|
failed:
|
|
-#ifdef USE_SYSTEMD
|
|
- sd_notify(0, "ERRNO=1");
|
|
-#endif
|
|
if (pid_fd >= 0)
|
|
close(pid_fd);
|
|
- exit(1);
|
|
+ exit(sd_notify_exit(1));
|
|
}
|
|
|
|
static int
|