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.4 KiB
Diff
53 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Wed, 16 Sep 2020 12:39:01 +0200
|
|
Subject: [PATCH] mpathpersist: use {get,put}_multipath_config() from
|
|
libmultipath
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
mpathpersist/main.c | 16 ++--------------
|
|
1 file changed, 2 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/mpathpersist/main.c b/mpathpersist/main.c
|
|
index a6a3bcf6..278e48f7 100644
|
|
--- a/mpathpersist/main.c
|
|
+++ b/mpathpersist/main.c
|
|
@@ -43,17 +43,6 @@ void mpath_print_transport_id(struct prin_fulldescr *fdesc);
|
|
int construct_transportid(const char * inp, struct transportid transid[], int num_transportids);
|
|
|
|
int logsink;
|
|
-struct config *multipath_conf;
|
|
-
|
|
-struct config *get_multipath_config(void)
|
|
-{
|
|
- return multipath_conf;
|
|
-}
|
|
-
|
|
-void put_multipath_config(__attribute__((unused)) void * arg)
|
|
-{
|
|
- /* Noop for now */
|
|
-}
|
|
|
|
void rcu_register_thread_memb(void) {}
|
|
|
|
@@ -653,15 +642,14 @@ int main(int argc, char *argv[])
|
|
}
|
|
|
|
udev = udev_new();
|
|
- multipath_conf = mpath_lib_init();
|
|
- if(!multipath_conf) {
|
|
+ if (libmpathpersist_init()) {
|
|
udev_unref(udev);
|
|
exit(1);
|
|
}
|
|
|
|
ret = handle_args(argc, argv, 0);
|
|
|
|
- mpath_lib_exit(multipath_conf);
|
|
+ libmpathpersist_exit();
|
|
udev_unref(udev);
|
|
|
|
return (ret >= 0) ? ret : MPATH_PR_OTHER;
|