Factor common code into new "start_mdmon".

[thirdparty/mdadm.git] / Incremental.c

diff --git a/Incremental.c b/Incremental.c
index d3f93a67ac2d93a11e63d1e07011a971cfef5dd6..9b22220604fc463f9fbba2ebc7fb493ac7d41ac7 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -300,12 +300,11 @@ int Incremental(char *devname, int verbose, int runstop,
        /* - add the device */
                mdu_array_info_t ainf;
                mdu_disk_info_t disk;
-               char md[20];
                struct mdinfo *sra;
 
                memset(&ainf, 0, sizeof(ainf));
-               ainf.major_version = st->ss->major;
-               ainf.minor_version = st->minor_version;
+               ainf.major_version = info.array.major_version;
+               ainf.minor_version = info.array.minor_version;
                if (ioctl(mdfd, SET_ARRAY_INFO, &ainf) != 0) {
                        fprintf(stderr, Name
                                ": SET_ARRAY_INFO failed for %s: %s\b",
@@ -313,9 +312,8 @@ int Incremental(char *devname, int verbose, int runstop,
                        close(mdfd);
                        return 2;
                }
-               sprintf(md, "%d.%d\n", st->ss->major, st->minor_version);
                sra = sysfs_read(mdfd, devnum, GET_VERSION);
-               sysfs_set_str(sra, NULL, "metadata_version", md);
+               sysfs_set_str(sra, NULL, "metadata_version", info.text_version);
                memset(&disk, 0, sizeof(disk));
                disk.major = major(stb.st_rdev);
                disk.minor = minor(stb.st_rdev);
@@ -352,29 +350,18 @@ int Incremental(char *devname, int verbose, int runstop,
                int err;
                struct mdinfo *sra;
                struct supertype *st2;
-               sra = sysfs_read(mdfd, devnum, (GET_VERSION | GET_DEVS |
-                                               GET_STATE));
+               sra = sysfs_read(mdfd, devnum, (GET_DEVS | GET_STATE));
 
-               if (sra->array.major_version != st->ss->major ||
-                   sra->array.minor_version != st->minor_version) {
-                       if (verbose >= 0)
-                               fprintf(stderr, Name
-             ": %s has different metadata to chosen array %s %d.%d %d.%d.\n",
-                                       devname, chosen_name,
-                                       sra->array.major_version,
-                                       sra->array.minor_version,
-                                       st->ss->major, st->minor_version);
-                       close(mdfd);
-                       return 1;
-               }
                sprintf(dn, "%d:%d", sra->devs->disk.major,
                        sra->devs->disk.minor);
                dfd2 = dev_open(dn, O_RDONLY);
                st2 = dup_super(st);
-               if (st2->ss->load_super(st2, dfd2, NULL)) {
+               if (st2->ss->load_super(st2, dfd2, NULL) ||
+                   st->ss->compare_super(st, st2) != 0) {
                        fprintf(stderr, Name
-                               ": Strange error loading metadata for %s.\n",
-                               chosen_name);
+                               ": metadata mismatch between %s and "
+                               "chosen array %s\n",
+                               devname, chosen_name);
                        close(mdfd);
                        close(dfd2);
                        return 2;
@@ -412,8 +399,7 @@ int Incremental(char *devname, int verbose, int runstop,
        }
        /* 6/ Make sure /var/run/mdadm.map contains this array. */
        map_update(&map, devnum,
-                  info.array.major_version,
-                  info.array.minor_version,
+                  info.text_version,
                   info.uuid, chosen_name);
 
        /* 7/ Is there enough devices to possibly start the array? */
@@ -647,8 +633,8 @@ void RebuildMap(void)
                                path = map_dev(MD_MAJOR, md->devnum, 0);
                        else
                                path = map_dev(mdp, (-1-md->devnum)<< 6, 0);
-                       map_add(&map, md->devnum, st->ss->major,
-                               st->minor_version,
+                       map_add(&map, md->devnum,
+                               info.text_version,
                                info.uuid, path ? : "/unknown");
                        st->ss->free_super(st);
                        break;
@@ -741,7 +727,7 @@ static char *container2devname(char *devname)
        int fd = open(devname, O_RDONLY);
        char *mdname = NULL;
 
-       if (fd > 0) {
+       if (fd >= 0) {
                mdname = devnum2devname(fd2devnum(fd));
                close(fd);
        }
@@ -850,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. */
-                               if (mdmon_running(st->container_dev))
-                                       signal_mdmon(st->container_dev);
-                               else {
-                                       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)