2cf40b2f98
- Add 0073-libmultipath-util-constify-function-arguments.patch
- Add 0074-libmultipath-constify-file-argument-in-config-parser.patch
- Add 0075-libmultipath-provide-defaults-for-get-put-_multipath.patch
- Add 0076-libmpathpersist-allow-using-libmultipath-get-put-_mu.patch
- Add 0077-multipath-use-get_put-_multipath_config-from-libmult.patch
- Add 0078-mpathpersist-use-get-put-_multipath_config-from-libm.patch
- Add 0079-libmultipath-add-udev-and-logsink-symbols.patch
- Add 0080-multipath-remove-logsink-and-udev.patch
- Add 0081-libmpathpersist-call-libmultipath_-init-exit.patch
- Add 0082-mpathpersist-remove-logsink-and-udev.patch
- Add 0083-multipathd-remove-logsink-and-udev.patch
* Pull in upsteam library changes
- Add 0084-libmpathvalid-use-default-_multipath_config-udev-and.patch
- Add 0085-Revert-libmultipath-add-ignore_udev_uid-option.patch
- Add 0086-libmultipath-change-log-level-for-null-uid_attribute.patch
- Add 0087-libmultipath-orphan_paths-avoid-BUG-message.patch
* update libmpathvalid to use upstream library changes. changes
submitted upstream
157 lines
4.7 KiB
Diff
157 lines
4.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:12 +0200
|
|
Subject: [PATCH] libmultipath: add udev and logsink symbols
|
|
|
|
With these symbols added, applications using libmultipath don't
|
|
need to define global variables "udev" and "logsink" any more.
|
|
This comes at the cost of having to call an init function.
|
|
Currently, libmultipath_init() does nothing but initialize
|
|
"udev".
|
|
|
|
The linker's symbol lookup order still allows applications to use
|
|
their own "logsink" and "udev" variables, which will take precendence
|
|
over libmultipath's internal ones. In this case, calling
|
|
libmultipath_init() can be skipped, but like before,
|
|
udev should be initialized (using udev_new()) before making any
|
|
libmultipath calls.
|
|
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/config.c | 46 +++++++++++++++++++++++++++++++++++++++++++
|
|
libmultipath/config.h | 46 ++++++++++++++++++++++++++++++++++++++++++-
|
|
libmultipath/debug.c | 2 ++
|
|
3 files changed, 93 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/config.c b/libmultipath/config.c
|
|
index 422e923d..b3809433 100644
|
|
--- a/libmultipath/config.c
|
|
+++ b/libmultipath/config.c
|
|
@@ -28,6 +28,52 @@
|
|
#include "propsel.h"
|
|
#include "version.h"
|
|
|
|
+/*
|
|
+ * We don't support re-initialization after
|
|
+ * libmultipath_exit().
|
|
+ */
|
|
+static bool libmultipath_exit_called;
|
|
+static pthread_once_t _init_once = PTHREAD_ONCE_INIT;
|
|
+static pthread_once_t _exit_once = PTHREAD_ONCE_INIT;
|
|
+struct udev *udev;
|
|
+
|
|
+static void _udev_init(void)
|
|
+{
|
|
+ if (udev)
|
|
+ udev_ref(udev);
|
|
+ else
|
|
+ udev = udev_new();
|
|
+ if (!udev)
|
|
+ condlog(0, "%s: failed to initialize udev", __func__);
|
|
+}
|
|
+
|
|
+static void _libmultipath_init(void)
|
|
+{
|
|
+ _udev_init();
|
|
+}
|
|
+
|
|
+static bool _is_libmultipath_initialized(void)
|
|
+{
|
|
+ return !libmultipath_exit_called && !!udev;
|
|
+}
|
|
+
|
|
+int libmultipath_init(void)
|
|
+{
|
|
+ pthread_once(&_init_once, _libmultipath_init);
|
|
+ return !_is_libmultipath_initialized();
|
|
+}
|
|
+
|
|
+static void _libmultipath_exit(void)
|
|
+{
|
|
+ libmultipath_exit_called = true;
|
|
+ udev_unref(udev);
|
|
+}
|
|
+
|
|
+void libmultipath_exit(void)
|
|
+{
|
|
+ pthread_once(&_exit_once, _libmultipath_exit);
|
|
+}
|
|
+
|
|
static struct config __internal_config;
|
|
struct config *libmp_get_multipath_config(void)
|
|
{
|
|
diff --git a/libmultipath/config.h b/libmultipath/config.h
|
|
index 83d179ac..089b2ac2 100644
|
|
--- a/libmultipath/config.h
|
|
+++ b/libmultipath/config.h
|
|
@@ -235,7 +235,51 @@ struct config {
|
|
char *enable_foreign;
|
|
};
|
|
|
|
-extern struct udev * udev;
|
|
+/**
|
|
+ * extern variable: udev
|
|
+ *
|
|
+ * A &struct udev instance used by libmultipath. libmultipath expects
|
|
+ * a valid, initialized &struct udev in this variable.
|
|
+ * An application can define this variable itself, in which case
|
|
+ * the applications's instance will take precedence.
|
|
+ * The application can initialize and destroy this variable by
|
|
+ * calling libmultipath_init() and libmultipath_exit(), respectively,
|
|
+ * whether or not it defines the variable itself.
|
|
+ * An application can initialize udev with udev_new() before calling
|
|
+ * libmultipath_init(), e.g. if it has to make libudev calls before
|
|
+ * libmultipath calls. If an application wants to keep using the
|
|
+ * udev variable after calling libmultipath_exit(), it should have taken
|
|
+ * an additional reference on it beforehand. This is the case e.g.
|
|
+ * after initiazing udev with udev_new().
|
|
+ */
|
|
+extern struct udev *udev;
|
|
+
|
|
+/**
|
|
+ * libmultipath_init() - library initialization
|
|
+ *
|
|
+ * This function initializes libmultipath data structures.
|
|
+ * It is light-weight; some other initializations, like device-mapper
|
|
+ * initialization, are done lazily when the respective functionality
|
|
+ * is required.
|
|
+ *
|
|
+ * Clean up by libmultipath_exit() when the program terminates.
|
|
+ * It is an error to call libmultipath_init() after libmultipath_exit().
|
|
+ * Return: 0 on success, 1 on failure.
|
|
+ */
|
|
+int libmultipath_init(void);
|
|
+
|
|
+/**
|
|
+ * libmultipath_exit() - library un-initialization
|
|
+ *
|
|
+ * This function un-initializes libmultipath data structures.
|
|
+ * It is recommended to call this function at program exit.
|
|
+ *
|
|
+ * Calls to libmultipath_init() after libmultipath_exit() will fail
|
|
+ * (in other words, libmultipath can't be re-initialized).
|
|
+ * Any other libmultipath calls after libmultipath_exit() may cause
|
|
+ * undefined behavior.
|
|
+ */
|
|
+void libmultipath_exit(void);
|
|
|
|
int find_hwe (const struct _vector *hwtable,
|
|
const char * vendor, const char * product, const char *revision,
|
|
diff --git a/libmultipath/debug.c b/libmultipath/debug.c
|
|
index 4128cb90..b3a1de9e 100644
|
|
--- a/libmultipath/debug.c
|
|
+++ b/libmultipath/debug.c
|
|
@@ -15,6 +15,8 @@
|
|
#include "defaults.h"
|
|
#include "debug.h"
|
|
|
|
+int logsink;
|
|
+
|
|
void dlog (int sink, int prio, const char * fmt, ...)
|
|
{
|
|
va_list ap;
|
|
--
|
|
2.17.2
|
|
|