57 lines
1.4 KiB
Diff
57 lines
1.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Martin Wilck <mwilck@suse.com>
|
||
|
|
Date: Thu, 24 Sep 2020 15:37:11 +0200
|
||
|
|
Subject: [PATCH] mpathpersist: use {get,put}_multipath_config() from
|
||
|
|
libmultipath
|
||
|
|
|
||
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
|
Signed-off-by: Martin Wilck <mwilck@suse.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 28bfe410..0f0db4b8 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) {}
|
||
|
|
|
||
|
|
@@ -620,15 +609,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;
|
||
|
|
--
|
||
|
|
2.17.2
|
||
|
|
|