From: Benjamin Marzinski <bmarzins@redhat.com>
To: mwilck@suse.com
Cc: dm-devel@redhat.com
Subject: Re: [PATCH v2 19/21] libmpathpersist: call libmultipath_{init, exit}()
Date: Fri, 25 Sep 2020 18:55:12 -0500 [thread overview]
Message-ID: <20200925235512.GG3384@octiron.msp.redhat.com> (raw)
In-Reply-To: <20200924133716.14120-20-mwilck@suse.com>
On Thu, Sep 24, 2020 at 03:37:14PM +0200, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
>
> Have libmpathpersist_{init,exit} do the udev initialization, too.
>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
> libmpathpersist/mpath_persist.c | 11 ++++++++---
> libmpathpersist/mpath_persist.h | 9 ++++++---
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
> index a529a38..873b419 100644
> --- a/libmpathpersist/mpath_persist.c
> +++ b/libmpathpersist/mpath_persist.c
> @@ -48,6 +48,10 @@ int libmpathpersist_init(void)
> struct config *conf;
> int rc = 0;
>
> + if (libmultipath_init()) {
> + condlog(0, "Failed to initialize libmultipath.");
> + return 1;
> + }
> if (init_config(DEFAULT_CONFIGFILE)) {
> condlog(0, "Failed to initialize multipath config.");
> return 1;
> @@ -74,23 +78,24 @@ mpath_lib_init (void)
>
> static void libmpathpersist_cleanup(void)
> {
> - dm_lib_exit();
> cleanup_prio();
> cleanup_checkers();
> + libmultipath_exit();
> + dm_lib_exit();
> }
>
> int
> mpath_lib_exit (struct config *conf)
> {
> - libmpathpersist_cleanup();
> free_config(conf);
> + libmpathpersist_cleanup();
> return 0;
> }
>
> int libmpathpersist_exit(void)
> {
> - libmpathpersist_cleanup();
> uninit_config();
> + libmpathpersist_cleanup();
> return 0;
> }
>
> diff --git a/libmpathpersist/mpath_persist.h b/libmpathpersist/mpath_persist.h
> index 91606ef..5435eae 100644
> --- a/libmpathpersist/mpath_persist.h
> +++ b/libmpathpersist/mpath_persist.h
> @@ -176,7 +176,8 @@ struct prout_param_descriptor { /* PROUT parameter descriptor */
> * Initialize device mapper multipath configuration. This function must be invoked first
> * before performing reservation management functions.
> * Either this function or mpath_lib_init() may be used.
> - * Use this function to work with libmultipath's internal "struct config".
> + * Use this function to work with libmultipath's internal "struct config"
> + * and "struct udev". The latter will be initialized automatically.
> * Call libmpathpersist_exit() for cleanup.
> * RESTRICTIONS:
> *
> @@ -189,7 +190,8 @@ extern int libmpathpersist_init (void);
> * Initialize device mapper multipath configuration. This function must be invoked first
> * before performing reservation management functions.
> * Either this function or libmpathpersist_init() may be used.
> - * Use this function to work with an application-specific "struct config".
> + * Use this function to work with an application-specific "struct config"
> + * and "struct udev". The latter must be initialized by the application.
> * Call mpath_lib_exit() for cleanup.
> * RESTRICTIONS:
> *
> @@ -211,9 +213,10 @@ extern int mpath_lib_exit (struct config *conf);
>
> /*
> * DESCRIPTION :
> - * Release device mapper multipath configuration. This function must be invoked after
> + * Release device mapper multipath configuration a. This function must be invoked after
> * performing reservation management functions.
> * Use this after initialization with libmpathpersist_init().
> + * Calling libmpathpersist_init() after libmpathpersist_exit() will fail.
> * RESTRICTIONS:
> *
> * RETURNS: 0->Success, 1->Failed.
> --
> 2.28.0
next prev parent reply other threads:[~2020-09-25 23:55 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 13:36 [PATCH v2 00/21] multipath-tools: shutdown, libdevmapper races, globals mwilck
2020-09-24 13:36 ` [PATCH v2 01/21] multipathd: allow shutdown during configure() mwilck
2020-09-24 13:36 ` [PATCH v2 02/21] multipathd: avoid sending "READY=1" to systemd on early shutdown mwilck
2020-09-24 13:36 ` [PATCH v2 03/21] multipathd: send "STOPPING=1" to systemd on shutdown mwilck
2020-09-24 13:36 ` [PATCH v2 04/21] multipathd: send "RELOADING=1" to systemd on DAEMON_CONFIGURE state mwilck
2020-09-24 13:37 ` [PATCH v2 05/21] multipathd: use volatile qualifier for running_state mwilck
2020-09-24 13:37 ` [PATCH v2 06/21] multipathd: generalize and fix wait_for_state_change_if() mwilck
2020-09-24 13:37 ` [PATCH v2 07/21] multipathd: set_config_state(): avoid code duplication mwilck
2020-09-24 13:37 ` [PATCH v2 08/21] multipathd: cancel threads early during shutdown mwilck
2020-09-24 13:37 ` [PATCH v2 09/21] multipath-tools: don't call dm_lib_release() any more mwilck
2020-09-24 13:37 ` [PATCH v2 10/21] libmultipath: devmapper: refactor libdm version determination mwilck
2020-09-25 23:48 ` Benjamin Marzinski
2020-09-24 13:37 ` [PATCH v2 11/21] libmultipath: protect racy libdevmapper calls with a mutex mwilck
2020-09-29 5:57 ` Benjamin Marzinski
2020-09-29 9:09 ` Martin Wilck
2020-09-24 13:37 ` [PATCH v2 12/21] libmultipath: constify file argument in config parser mwilck
2020-09-24 13:37 ` [PATCH v2 13/21] libmultipath: provide defaults for {get, put}_multipath_config mwilck
2020-09-25 4:34 ` Benjamin Marzinski
2020-09-25 20:00 ` Martin Wilck
2020-09-25 21:57 ` Benjamin Marzinski
2020-09-26 9:43 ` Martin Wilck
2020-09-27 1:03 ` Benjamin Marzinski
2020-09-24 13:37 ` [PATCH v2 14/21] libmpathpersist: allow using libmultipath " mwilck
2020-09-24 13:37 ` [PATCH v2 15/21] multipath: use {get_put}_multipath_config from libmultipath mwilck
2020-09-24 13:37 ` [PATCH v2 16/21] mpathpersist: use {get, put}_multipath_config() " mwilck
2020-09-24 13:37 ` [PATCH v2 17/21] libmultipath: add udev and logsink symbols mwilck
2020-09-25 23:03 ` Benjamin Marzinski
2020-09-25 23:05 ` Martin Wilck
2020-09-24 13:37 ` [PATCH v2 18/21] multipath: remove logsink and udev mwilck
2020-09-24 13:37 ` [PATCH v2 19/21] libmpathpersist: call libmultipath_{init, exit}() mwilck
2020-09-25 23:55 ` Benjamin Marzinski [this message]
2020-09-24 13:37 ` [PATCH v2 20/21] mpathpersist: remove logsink and udev mwilck
2020-09-25 23:56 ` Benjamin Marzinski
2020-09-24 13:37 ` [PATCH v2 21/21] multipathd: " mwilck
2020-09-26 0:19 ` Benjamin Marzinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200925235512.GG3384@octiron.msp.redhat.com \
--to=bmarzins@redhat.com \
--cc=dm-devel@redhat.com \
--cc=mwilck@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).