From patchwork Wed Sep 16 15:37:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 11779931 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4800A1580 for ; Wed, 16 Sep 2020 15:40:04 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D847022242 for ; Wed, 16 Sep 2020 15:40:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D847022242 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-379-W5hqffaKOg2gVngRqeoAyw-1; Wed, 16 Sep 2020 11:39:59 -0400 X-MC-Unique: W5hqffaKOg2gVngRqeoAyw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 937F380B71A; Wed, 16 Sep 2020 15:39:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 776D160CC0; Wed, 16 Sep 2020 15:39:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4E892183D037; Wed, 16 Sep 2020 15:39:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08GFdZCV024296 for ; Wed, 16 Sep 2020 11:39:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 19841F5578; Wed, 16 Sep 2020 15:39:35 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 129CEF5AF3 for ; Wed, 16 Sep 2020 15:39:35 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE578101AA40 for ; Wed, 16 Sep 2020 15:39:34 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-373-0i3s0Eu1MEyQyqH1rXYiXw-1; Wed, 16 Sep 2020 11:39:29 -0400 X-MC-Unique: 0i3s0Eu1MEyQyqH1rXYiXw-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id DE3FAB339; Wed, 16 Sep 2020 15:39:41 +0000 (UTC) From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Wed, 16 Sep 2020 17:37:15 +0200 Message-Id: <20200916153718.582-17-mwilck@suse.com> In-Reply-To: <20200916153718.582-1-mwilck@suse.com> References: <20200916153718.582-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 08GFdZCV024296 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Martin Wilck Subject: [dm-devel] [PATCH 16/19] mpathpersist: use {get, put}_multipath_config() from libmultipath X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com 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;