[PATCH v2 5/6] multipathd: move resize_map() to multipathd/main.c

[Benjamin Marzinski]

No functional changes.

Reviewed-by: Martin Wilck <mwi...@suse.com>
Signed-off-by: Benjamin Marzinski <bmarz...@redhat.com>
---
 multipathd/cli_handlers.c | 29 -----------------------------
 multipathd/main.c         | 29 +++++++++++++++++++++++++++++
 multipathd/main.h         |  2 ++
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
index cf75b45f..420d75df 100644
--- a/multipathd/cli_handlers.c
+++ b/multipathd/cli_handlers.c
@@ -813,35 +813,6 @@ cli_reload(void *v, struct strbuf *reply, void *data)
        return reload_and_sync_map(mpp, vecs);
 }
 
-static int resize_map(struct multipath *mpp, unsigned long long size,
-              struct vectors * vecs)
-{
-       char *params __attribute__((cleanup(cleanup_charp))) = NULL;
-       unsigned long long orig_size = mpp->size;
-
-       mpp->size = size;
-       update_mpp_paths(mpp, vecs->pathvec);
-       if (setup_map(mpp, &params, vecs) != 0) {
-               condlog(0, "%s: failed to setup map for resize : %s",
-                       mpp->alias, strerror(errno));
-               mpp->size = orig_size;
-               return 1;
-       }
-       mpp->action = ACT_RESIZE;
-       mpp->force_udev_reload = 1;
-       if (domap(mpp, params, 1) == DOMAP_FAIL) {
-               condlog(0, "%s: failed to resize map : %s", mpp->alias,
-                       strerror(errno));
-               mpp->size = orig_size;
-               return 1;
-       }
-       if (setup_multipath(vecs, mpp) != 0)
-               return 2;
-       sync_map_state(mpp);
-
-       return 0;
-}
-
 static int
 cli_resize(void *v, struct strbuf *reply, void *data)
 {
diff --git a/multipathd/main.c b/multipathd/main.c
index 214ed4ae..3b4c5b09 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1530,6 +1530,35 @@ needs_ro_update(struct multipath *mpp, int ro)
        return true;
 }
 
+int resize_map(struct multipath *mpp, unsigned long long size,
+              struct vectors * vecs)
+{
+       char *params __attribute__((cleanup(cleanup_charp))) = NULL;
+       unsigned long long orig_size = mpp->size;
+
+       mpp->size = size;
+       update_mpp_paths(mpp, vecs->pathvec);
+       if (setup_map(mpp, &params, vecs) != 0) {
+               condlog(0, "%s: failed to setup map for resize : %s",
+                       mpp->alias, strerror(errno));
+               mpp->size = orig_size;
+               return 1;
+       }
+       mpp->action = ACT_RESIZE;
+       mpp->force_udev_reload = 1;
+       if (domap(mpp, params, 1) == DOMAP_FAIL) {
+               condlog(0, "%s: failed to resize map : %s", mpp->alias,
+                       strerror(errno));
+               mpp->size = orig_size;
+               return 1;
+       }
+       if (setup_multipath(vecs, mpp) != 0)
+               return 2;
+       sync_map_state(mpp);
+
+       return 0;
+}
+
 static int
 uev_update_path (struct uevent *uev, struct vectors * vecs)
 {
diff --git a/multipathd/main.h b/multipathd/main.h
index a253d186..8a178c0b 100644
--- a/multipathd/main.h
+++ b/multipathd/main.h
@@ -52,4 +52,6 @@ int reload_and_sync_map(struct multipath *mpp, struct vectors 
*vecs);
 void handle_path_wwid_change(struct path *pp, struct vectors *vecs);
 bool check_path_wwid_change(struct path *pp);
 int finish_path_init(struct path *pp, struct vectors * vecs);
+int resize_map(struct multipath *mpp, unsigned long long size,
+              struct vectors *vecs);
 #endif /* MAIN_H */
-- 
2.41.0