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 11:18:02 +0200
|
|
Subject: [PATCH] multipathd: make some globals static
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 3da0d7cc..eb760a71 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -116,19 +116,19 @@ struct mpath_event_param
|
|
};
|
|
|
|
int uxsock_timeout;
|
|
-int verbosity;
|
|
-int bindings_read_only;
|
|
+static int verbosity;
|
|
+static int bindings_read_only;
|
|
int ignore_new_devs;
|
|
#ifdef NO_DMEVENTS_POLL
|
|
-int poll_dmevents = 0;
|
|
+static int poll_dmevents = 0;
|
|
#else
|
|
-int poll_dmevents = 1;
|
|
+static int poll_dmevents = 1;
|
|
#endif
|
|
/* Don't access this variable without holding config_lock */
|
|
-volatile enum daemon_status running_state = DAEMON_INIT;
|
|
+static volatile enum daemon_status running_state = DAEMON_INIT;
|
|
pid_t daemon_pid;
|
|
-pthread_mutex_t config_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
-pthread_cond_t config_cond;
|
|
+static pthread_mutex_t config_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
+static pthread_cond_t config_cond;
|
|
|
|
static inline enum daemon_status get_running_state(void)
|
|
{
|