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
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Tue, 15 Sep 2020 12:48:55 +0200
|
|
Subject: [PATCH] multipathd: set_config_state(): avoid code duplication
|
|
|
|
Use __post_config_state() and __wait_for_state_change(). This
|
|
way __post_config_state() is the only place where running_state
|
|
is ever changed, and we avoid code duplication.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 23 +++++------------------
|
|
1 file changed, 5 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 1fb0ee62..39aea4ad 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -292,27 +292,14 @@ int set_config_state(enum daemon_status state)
|
|
pthread_cleanup_push(config_cleanup, NULL);
|
|
pthread_mutex_lock(&config_lock);
|
|
if (running_state != state) {
|
|
-#ifdef USE_SYSTEMD
|
|
- enum daemon_status old_state = running_state;
|
|
-#endif
|
|
|
|
if (running_state == DAEMON_SHUTDOWN)
|
|
rc = EINVAL;
|
|
- else if (running_state != DAEMON_IDLE) {
|
|
- struct timespec ts;
|
|
-
|
|
- get_monotonic_time(&ts);
|
|
- ts.tv_sec += 1;
|
|
- rc = pthread_cond_timedwait(&config_cond,
|
|
- &config_lock, &ts);
|
|
- }
|
|
- if (!rc && (running_state != DAEMON_SHUTDOWN)) {
|
|
- running_state = state;
|
|
- pthread_cond_broadcast(&config_cond);
|
|
-#ifdef USE_SYSTEMD
|
|
- do_sd_notify(old_state, state);
|
|
-#endif
|
|
- }
|
|
+ else
|
|
+ rc = __wait_for_state_change(
|
|
+ running_state != DAEMON_IDLE, 1000);
|
|
+ if (!rc)
|
|
+ __post_config_state(state);
|
|
}
|
|
pthread_cleanup_pop(1);
|
|
return rc;
|