Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C87D4C4363A for ; Fri, 16 Oct 2020 10:44:19 +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 2759A2084C for ; Fri, 16 Oct 2020 10:44:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2759A2084C Authentication-Results: mail.kernel.org; dmarc=fail (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-275-W16SJyNgNk2D1tFWm2Ydkw-1; Fri, 16 Oct 2020 06:44:15 -0400 X-MC-Unique: W16SJyNgNk2D1tFWm2Ydkw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A99B1019643; Fri, 16 Oct 2020 10:44:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F29476653; Fri, 16 Oct 2020 10:44:03 +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 E57635811A; Fri, 16 Oct 2020 10:44:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09GAhsvu020213 for ; Fri, 16 Oct 2020 06:43:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id A6D532156A37; Fri, 16 Oct 2020 10:43:54 +0000 (UTC) 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 A1B972166B28 for ; Fri, 16 Oct 2020 10:43:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 79A10101A568 for ; Fri, 16 Oct 2020 10:43:54 +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-430-aTIURrNUM1asrvT_FIEFwA-1; Fri, 16 Oct 2020 06:43:51 -0400 X-MC-Unique: aTIURrNUM1asrvT_FIEFwA-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 C48DAAF2F; Fri, 16 Oct 2020 10:43:48 +0000 (UTC) From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Fri, 16 Oct 2020 12:43:23 +0200 Message-Id: <20201016104329.8337-16-mwilck@suse.com> In-Reply-To: <20201016104329.8337-1-mwilck@suse.com> References: <20201016104329.8337-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.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 09GAhsvu020213 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Martin Wilck Subject: [dm-devel] [PATCH v3 15/21] multipath: 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.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Martin Wilck Reviewed-by: Benjamin Marzinski Signed-off-by: Martin Wilck --- multipath/main.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/multipath/main.c b/multipath/main.c index dc4974b..4bbfce9 100644 --- a/multipath/main.c +++ b/multipath/main.c @@ -68,7 +68,6 @@ int logsink; struct udev *udev; -struct config *multipath_conf; /* * Return values of configure(), check_path_valid(), and main(). @@ -79,16 +78,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) { @@ -823,10 +812,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, ":adDcChl::eFfM:v:p:b:BrR:itTquUwW")) != EOF ) { @@ -1078,8 +1066,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.28.0 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel