69 lines
1.7 KiB
Diff
69 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Martin Wilck <mwilck@suse.com>
|
||
|
|
Date: Thu, 24 Sep 2020 15:37:10 +0200
|
||
|
|
Subject: [PATCH] multipath: 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>
|
||
|
|
---
|
||
|
|
multipath/main.c | 20 ++++----------------
|
||
|
|
1 file changed, 4 insertions(+), 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/multipath/main.c b/multipath/main.c
|
||
|
|
index ce48a932..879d7ac9 100644
|
||
|
|
--- a/multipath/main.c
|
||
|
|
+++ b/multipath/main.c
|
||
|
|
@@ -67,7 +67,6 @@
|
||
|
|
|
||
|
|
int logsink;
|
||
|
|
struct udev *udev;
|
||
|
|
-struct config *multipath_conf;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Return values of configure(), check_path_valid(), and main().
|
||
|
|
@@ -78,16 +77,6 @@ enum {
|
||
|
|
RTVL_RETRY, /* returned by configure(), not by main() */
|
||
|
|
};
|
||
|
|
|
||
|
|
-struct config *get_multipath_config(void)
|
||
|
|
-{
|
||
|
|
- return multipath_conf;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-void put_multipath_config(__attribute__((unused)) void *arg)
|
||
|
|
-{
|
||
|
|
- /* Noop for now */
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static int
|
||
|
|
dump_config (struct config *conf, vector hwes, vector mpvec)
|
||
|
|
{
|
||
|
|
@@ -892,10 +881,9 @@ main (int argc, char *argv[])
|
||
|
|
|
||
|
|
udev = udev_new();
|
||
|
|
logsink = 0;
|
||
|
|
- conf = load_config(DEFAULT_CONFIGFILE);
|
||
|
|
- if (!conf)
|
||
|
|
+ if (init_config(DEFAULT_CONFIGFILE))
|
||
|
|
exit(RTVL_FAIL);
|
||
|
|
- multipath_conf = conf;
|
||
|
|
+ conf = get_multipath_config();
|
||
|
|
conf->retrigger_tries = 0;
|
||
|
|
conf->force_sync = 1;
|
||
|
|
while ((arg = getopt(argc, argv, ":aAdDcChl::eFfM:v:p:b:BrR:itTquUwW")) != EOF ) {
|
||
|
|
@@ -1148,8 +1136,8 @@ out_free_config:
|
||
|
|
* the logging function (dm_write_log()), which is called there,
|
||
|
|
* references the config.
|
||
|
|
*/
|
||
|
|
- free_config(conf);
|
||
|
|
- conf = NULL;
|
||
|
|
+ put_multipath_config(conf);
|
||
|
|
+ uninit_config();
|
||
|
|
udev_unref(udev);
|
||
|
|
if (dev)
|
||
|
|
FREE(dev);
|
||
|
|
--
|
||
|
|
2.17.2
|
||
|
|
|