Fix memory leaks in reshape_array()

[thirdparty/mdadm.git] / msg.c

diff --git a/msg.c b/msg.c
index a1f4bc6e0b5540556549b08578f4190b9e1d704e..98d6d13b1e216d27189a47427e8db17f10b22026 100644 (file)
--- a/msg.c
+++ b/msg.c
@@ -213,6 +213,20 @@ int ping_monitor(char *devname)
        return err;
 }
 
+/* ping monitor using device number */
+int ping_monitor_by_id(int devnum)
+{
+       int err = -1;
+       char *container = devnum2devname(devnum);
+
+       if (container) {
+               err = ping_monitor(container);
+               free(container);
+       }
+
+       return err;
+}
+
 static char *ping_monitor_version(char *devname)
 {
        int sfd = connect_monitor(devname);
@@ -267,6 +281,40 @@ int block_subarray(struct mdinfo *sra)
 
        return rc;
 }
+
+/* check mdmon version if it supports
+ * array blocking mechanism
+ */
+int check_mdmon_version(char *container)
+{
+       char *version = NULL;
+       int devnum = devname2devnum(container);
+
+       if (!mdmon_running(devnum)) {
+               /* if mdmon is not active we assume that any instance that is
+                * later started will match the current mdadm version, if this
+                * assumption is violated we may inadvertantly rebuild an array
+                * that was meant for reshape, or start rebuild on a spare that
+                * was to be moved to another container
+                */
+               /* pass */;
+       } else {
+               int ver;
+
+               version = ping_monitor_version(container);
+               ver = version ? mdadm_version(version) : -1;
+               free(version);
+               if (ver < 3002000) {
+                       fprintf(stderr, Name
+                               ": mdmon instance for %s cannot be disabled\n",
+                               container);
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
 /**
  * block_monitor - prevent mdmon spare assignment
  * @container - container to block
@@ -288,34 +336,13 @@ int block_subarray(struct mdinfo *sra)
  */
 int block_monitor(char *container, const int freeze)
 {
-       int devnum = devname2devnum(container);
        struct mdstat_ent *ent, *e, *e2;
        struct mdinfo *sra = NULL;
-       char *version = NULL;
        char buf[64];
        int rv = 0;
 
-       if (!mdmon_running(devnum)) {
-               /* if mdmon is not active we assume that any instance that is
-                * later started will match the current mdadm version, if this
-                * assumption is violated we may inadvertantly rebuild an array
-                * that was meant for reshape, or start rebuild on a spare that
-                * was to be moved to another container
-                */
-               /* pass */;
-       } else {
-               int ver;
-
-               version = ping_monitor_version(container);
-               ver = version ? mdadm_version(version) : -1;
-               free(version);
-               if (ver < 3002000) {
-                       fprintf(stderr, Name
-                               ": mdmon instance for %s cannot be disabled\n",
-                               container);
-                       return -1;
-               }
-       }
+       if (check_mdmon_version(container))
+               return -1;
 
        ent = mdstat_read(0, 0);
        if (!ent) {