Factor common code into new "start_mdmon".

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/Create.c b/Create.c
index b2edc7d6e7bcada0514854cc498fe105865f9ec9..692a74ccde8e452533e0d069e88359d651c5267d 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -769,28 +769,10 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                if (verbose >= 0)
                        fprintf(stderr, Name ": array %s started.\n", mddev);
                if (st->ss->external && st->subarray[0]) {
                if (verbose >= 0)
                        fprintf(stderr, Name ": array %s started.\n", mddev);
                if (st->ss->external && st->subarray[0]) {

-                       if (need_mdmon && !env_no_mdmon()) {
-                               int dn = st->container_dev;
-                               int i;
-                               switch(fork()) {
-                               case 0:
-                                       /* FIXME yuk. CLOSE_EXEC?? */
-                                       for (i=3; i < 100; i++)
-                                               close(i);
-                                       execl("./mdmon", "mdmon",
-                                             map_dev(dev2major(dn),
-                                                     dev2minor(dn),
-                                                     1), NULL);
-                                       exit(1);
-                               case -1: fprintf(stderr, Name ": cannot fork. "
-                                                "Array remains readonly\n");
-                                       return 1;
-                               default: ; /* parent - good */
-                               }
-                       } else
-                               signal_mdmon(st->container_dev);
-                       /* FIXME wait for mdmon to set array to read-auto */
-                       sleep(1);
+                       if (need_mdmon)
+                               start_mdmon(st->container_dev);
+
+                       ping_monitor(devnum2devname(st->container_dev));

                        close(container_fd);
                }
        } else {
                        close(container_fd);
                }
        } else {

diff --git a/Incremental.c b/Incremental.c
index e9a54578a711b4fddef00d92136534f2b21bc52f..9b22220604fc463f9fbba2ebc7fb493ac7d41ac7 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -836,28 +836,9 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
                                sysfs_set_str(sra, NULL, "array_state",
                                              "readonly");
                                /* start mdmon if needed. */
                                sysfs_set_str(sra, NULL, "array_state",
                                              "readonly");
                                /* start mdmon if needed. */

-                               if (mdmon_running(st->container_dev))
-                                       signal_mdmon(st->container_dev);
-                               else if (!env_no_mdmon()) {
-                                       int dn = st->container_dev;
-                                       int i;
-                                       switch(fork()) {
-                                       case 0:
-                                               /* FIXME yuk. CLOSE_EXEC?? */
-                                               for (i=3; i < 100; i++)
-                                                       close(i);
-                                               execl("./mdmon", "mdmon",
-                                                     map_dev(dev2major(dn),
-                                                             dev2minor(dn),
-                                                             1), NULL);
-                                               exit(1);
-                                       case -1: fprintf(stderr, Name
-                                                        ": cannot fork. "
-                                                 "Array remains readonly\n");
-                                               return 1;
-                                       default: ; /* parent - good */
-                                       }
-                               }
+                               if (!mdmon_running(st->container_dev))
+                                       start_mdmon(st->container_dev);
+                               ping_monitor(devnum2devname(st->container_dev));

                                break;
                        }
                        if (verbose >= 0)
                                break;
                        }
                        if (verbose >= 0)

diff --git a/mdadm.h b/mdadm.h
index 3672bc9daad2744e8f587496e64251420ca1ab13..2c941cc0963cf0783072d96f2c6098de389346f2 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -774,6 +774,7 @@ extern int open_container(int fd);
 extern int mdmon_running(int devnum);
 extern int signal_mdmon(int devnum);
 extern int env_no_mdmon(void);
 extern int mdmon_running(int devnum);
 extern int signal_mdmon(int devnum);
 extern int env_no_mdmon(void);

+extern int start_mdmon(int devnum);

 
 extern char *devnum2devname(int num);
 extern int devname2devnum(char *name);
 
 extern char *devnum2devname(int num);
 extern int devname2devnum(char *name);

diff --git a/util.c b/util.c
index 283eeb6d4118ae656d985ce13654f77d411eb134..da61a0be60048a2ea7da3aeb6d1a2dc6471f5d48 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1074,6 +1074,31 @@ int signal_mdmon(int devnum)
        return 0;
 }
 
        return 0;
 }
 

+int start_mdmon(int devnum)
+{
+       int i;
+
+       if (env_no_mdmon())
+               return 0;
+
+       switch(fork()) {
+       case 0:
+               /* FIXME yuk. CLOSE_EXEC?? */
+               for (i=3; i < 100; i++)
+                       close(i);
+               execl("./mdmon", "mdmon",
+                     map_dev(dev2major(devnum),
+                             dev2minor(devnum),
+                             1), NULL);
+               exit(1);
+       case -1: fprintf(stderr, Name ": cannot run mdmon. "
+                        "Array remains readonly\n");
+               return -1;
+       default: ; /* parent - good */
+       }
+       return 0;
+}
+

 int env_no_mdmon(void)
 {
        char *val = getenv("MDADM_NO_MDMON");
 int env_no_mdmon(void)
 {
        char *val = getenv("MDADM_NO_MDMON");