On Fri, Dec 19, 2025 at 03:40:58PM +0100, Martin Wilck wrote:
> This function is not used any more.
>
> Suggested-by: Benjamin Marzinski <[email protected]>
> Signed-off-by: Martin Wilck <[email protected]>
> ---
> libmultipath/libmultipath.version | 1 -
> libmultipath/structs.c | 6 ------
> libmultipath/structs.h | 1 -
> 3 files changed, 8 deletions(-)
>
> diff --git a/libmultipath/libmultipath.version
> b/libmultipath/libmultipath.version
> index 366b829..39384d6 100644
> --- a/libmultipath/libmultipath.version
> +++ b/libmultipath/libmultipath.version
> @@ -69,7 +69,6 @@ global:
> cleanup_bindings;
> cleanup_lock;
> cleanup_multipath;
> - cleanup_multipath_and_paths;
> cleanup_pathvec_and_free_paths;
> cleanup_udev_device_ptr;
> cleanup_udev_enumerate_ptr;
> diff --git a/libmultipath/structs.c b/libmultipath/structs.c
> index 9e1734d..868c3d6 100644
> --- a/libmultipath/structs.c
> +++ b/libmultipath/structs.c
> @@ -324,12 +324,6 @@ void cleanup_multipath(struct multipath **pmpp)
> free_multipath(*pmpp);
> }
>
> -void cleanup_multipath_and_paths(struct multipath **pmpp)
> -{
> - if (*pmpp)
> - free_multipath(*pmpp);
> -}
> -
Like I said in 14/26, I think we want to keep this to clean up
add_map_without_path(). It should loop through the paths in (*pmpp)->pg,
orphaning them, before calling free_multipath().
-Ben
> void free_multipathvec(vector mpvec)
> {
> int i;
> diff --git a/libmultipath/structs.h b/libmultipath/structs.h
> index a637af7..251e672 100644
> --- a/libmultipath/structs.h
> +++ b/libmultipath/structs.h
> @@ -582,7 +582,6 @@ void free_pathgroup(struct pathgroup *pgp);
> void free_pgvec(vector pgvec);
> void free_multipath(struct multipath *mpp);
> void cleanup_multipath(struct multipath **pmpp);
> -void cleanup_multipath_and_paths(struct multipath **pmpp);
> void free_multipath_attributes(struct multipath *);
> void free_multipathvec(vector mpvec);
>
> --
> 2.52.0
