From mboxrd@z Thu Jan 1 00:00:00 1970 From: mwilck@suse.com Subject: [PATCH 16/19] mpathpersist: use {get, put}_multipath_config() from libmultipath Date: Wed, 16 Sep 2020 17:37:15 +0200 Message-ID: <20200916153718.582-17-mwilck@suse.com> References: <20200916153718.582-1-mwilck@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20200916153718.582-1-mwilck@suse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@redhat.com, Martin Wilck List-Id: dm-devel.ids From: Martin Wilck Signed-off-by: Martin Wilck --- mpathpersist/main.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/mpathpersist/main.c b/mpathpersist/main.c index 28bfe41..0f0db4b 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.28.0