From: Martin Wilck <[email protected]> This requires another major ABI bump.
Reviewed-by: Benjamin Marzinski <[email protected]> Signed-off-by: Martin Wilck <[email protected]> --- libmpathpersist/mpath_persist.c | 2 -- libmultipath/config.c | 4 ++++ libmultipath/libmultipath.version | 5 +---- multipathd/main.c | 3 --- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c index e1d1cb7..9ebf91d 100644 --- a/libmpathpersist/mpath_persist.c +++ b/libmpathpersist/mpath_persist.c @@ -78,8 +78,6 @@ mpath_lib_init (void) static void libmpathpersist_cleanup(void) { - cleanup_prio(); - cleanup_checkers(); libmultipath_exit(); dm_lib_exit(); } diff --git a/libmultipath/config.c b/libmultipath/config.c index b9cb413..52b1447 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -26,6 +26,7 @@ #include "devmapper.h" #include "mpath_cmd.h" #include "propsel.h" +#include "foreign.h" /* * We don't support re-initialization after @@ -60,6 +61,9 @@ int libmultipath_init(void) static void _libmultipath_exit(void) { libmultipath_exit_called = true; + cleanup_foreign(); + cleanup_checkers(); + cleanup_prio(); libmp_dm_exit(); udev_unref(udev); } diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version index 84beb7f..800cff2 100644 --- a/libmultipath/libmultipath.version +++ b/libmultipath/libmultipath.version @@ -31,7 +31,7 @@ * The new version inherits the previous ones. */ -LIBMULTIPATH_3.0.0 { +LIBMULTIPATH_4.0.0 { global: /* symbols referenced by multipath and multipathd */ add_foreign; @@ -51,10 +51,7 @@ global: checker_name; checker_state_name; check_foreign; - cleanup_checkers; - cleanup_foreign; cleanup_lock; - cleanup_prio; close_fd; coalesce_paths; convert_dev; diff --git a/multipathd/main.c b/multipathd/main.c index 50cc335..4de0978 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -3028,9 +3028,6 @@ static void cleanup_child(void) { cleanup_threads(); cleanup_vecs(); - cleanup_foreign(); - cleanup_checkers(); - cleanup_prio(); if (poll_dmevents) cleanup_dmevent_waiter(); -- 2.29.0 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
