wait_for improvement.

wait not only for the name to appear, but for it to refer to the
correct device.
Sometimes old symlinks left lying around can be confusing.

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

diff --git a/Assemble.c b/Assemble.c
index 99f3599184cd4c4aad2ac69eb024197c5fcfa8fa..172bc53e80e0393ebedbadfcf0ad4b583c709618 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -1069,7 +1069,7 @@ int Assemble(struct supertype *st, char *mddev,
                                fprintf(stderr, "\n");
                        }
                        sysfs_uevent(content, "change");
                                fprintf(stderr, "\n");
                        }
                        sysfs_uevent(content, "change");

-                       wait_for(chosen_name);
+                       wait_for(chosen_name, mdfd);

                        close(mdfd);
                        return 0;
                }
                        close(mdfd);
                        return 0;
                }


@@ -1104,8 +1104,8 @@ int Assemble(struct supertype *st, char *mddev,
                                                                      (4 * content->array.chunk_size / 4096) + 1);
                                        }
                                }
                                                                      (4 * content->array.chunk_size / 4096) + 1);
                                        }
                                }

+                               wait_for(mddev, mdfd);

                                close(mdfd);
                                close(mdfd);

-                               wait_for(mddev);

                                if (auto_assem) {
                                        int usecs = 1;
                                        /* There is a nasty race with 'mdadm --monitor'.
                                if (auto_assem) {
                                        int usecs = 1;
                                        /* There is a nasty race with 'mdadm --monitor'.


@@ -1276,7 +1276,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
                        fprintf(stderr, "\n");
                }
                if (!err)
                        fprintf(stderr, "\n");
                }
                if (!err)

-                       wait_for(chosen_name);
+                       wait_for(chosen_name, mdfd);

                close(mdfd);
                return 0;
                /* FIXME should have an O_EXCL and wait for read-auto */
                close(mdfd);
                return 0;
                /* FIXME should have an O_EXCL and wait for read-auto */

diff --git a/Build.c b/Build.c
index 52fc0ca01623cbeb220aa180a488fdcbd557e552..358f8e6f7fdf4e214caa750a3ef89ce43e83a7c2 100644 (file)
--- a/Build.c
+++ b/Build.c
@@ -281,8 +281,8 @@ int Build(char *mddev, int chunk, int level, int layout,
        if (verbose >= 0)
                fprintf(stderr, Name ": array %s built and started.\n",
                        mddev);
        if (verbose >= 0)
                fprintf(stderr, Name ": array %s built and started.\n",
                        mddev);

+       wait_for(mddev, mdfd);

        close(mdfd);
        close(mdfd);

-       wait_for(mddev);

        return 0;
 
  abort:
        return 0;
 
  abort:

diff --git a/Create.c b/Create.c
index 9f52b41da9e7c9b5f1e2c1040bc381ee9087ac5a..36df10ddc65681b34b1fb021793f68c307b0121e 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -810,7 +810,7 @@ int Create(struct supertype *st, char *mddev,
                sysfs_uevent(&info, "change");
                if (verbose >= 0)
                        fprintf(stderr, Name ": container %s prepared.\n", mddev);
                sysfs_uevent(&info, "change");
                if (verbose >= 0)
                        fprintf(stderr, Name ": container %s prepared.\n", mddev);

-               wait_for(chosen_name);
+               wait_for(chosen_name, mdfd);

        } else if (runstop == 1 || subdevs >= raiddisks) {
                if (st->ss->external) {
                        switch(level) {
        } else if (runstop == 1 || subdevs >= raiddisks) {
                if (st->ss->external) {
                        switch(level) {


@@ -846,7 +846,7 @@ int Create(struct supertype *st, char *mddev,
                        ping_monitor(devnum2devname(st->container_dev));
                        close(container_fd);
                }
                        ping_monitor(devnum2devname(st->container_dev));
                        close(container_fd);
                }

-               wait_for(chosen_name);
+               wait_for(chosen_name, mdfd);

        } else {
                fprintf(stderr, Name ": not starting array - not enough devices.\n");
        }
        } else {
                fprintf(stderr, Name ": not starting array - not enough devices.\n");
        }

diff --git a/Incremental.c b/Incremental.c
index 99fc1bfcac611aceb21354ba3ae9b82d6985e0d3..b1cee23fe0c94285047789ee3bb7c1bf3747d29e 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -392,14 +392,14 @@ int Incremental(char *devname, int verbose, int runstop,
        /* 7a/ if not, finish with success. */
        if (info.array.level == LEVEL_CONTAINER) {
                /* Try to assemble within the container */
        /* 7a/ if not, finish with success. */
        if (info.array.level == LEVEL_CONTAINER) {
                /* Try to assemble within the container */

-               close(mdfd);

                map_unlock(&map);
                sysfs_uevent(&info, "change");
                if (verbose >= 0)
                        fprintf(stderr, Name
                                ": container %s now has %d devices\n",
                                chosen_name, info.array.working_disks);
                map_unlock(&map);
                sysfs_uevent(&info, "change");
                if (verbose >= 0)
                        fprintf(stderr, Name
                                ": container %s now has %d devices\n",
                                chosen_name, info.array.working_disks);

-               wait_for(chosen_name);
+               wait_for(chosen_name, mdfd);
+               close(mdfd);

                if (runstop < 0)
                        return 0; /* don't try to assemble */
                return Incremental(chosen_name, verbose, runstop,
                if (runstop < 0)
                        return 0; /* don't try to assemble */
                return Incremental(chosen_name, verbose, runstop,


@@ -474,7 +474,7 @@ int Incremental(char *devname, int verbose, int runstop,
                           ": %s attached to %s, which has been started.\n",
                                        devname, chosen_name);
                        rv = 0;
                           ": %s attached to %s, which has been started.\n",
                                        devname, chosen_name);
                        rv = 0;

-                       wait_for(chosen_name);
+                       wait_for(chosen_name, mdfd);

                } else {
                        fprintf(stderr, Name
                              ": %s attached to %s, but failed to start: %s.\n",
                } else {
                        fprintf(stderr, Name
                              ": %s attached to %s, but failed to start: %s.\n",

diff --git a/mdadm.h b/mdadm.h
index 6770d6c866589b3489cb163bf203fea4c16e48f7..83a7944b58d13dade07035319bb9761ea08a8fee 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -657,7 +657,7 @@ extern struct supertype *dup_super(struct supertype *st);
 extern int get_dev_size(int fd, char *dname, unsigned long long *sizep);
 extern void get_one_disk(int mdfd, mdu_array_info_t *ainf,
                         mdu_disk_info_t *disk);
 extern int get_dev_size(int fd, char *dname, unsigned long long *sizep);
 extern void get_one_disk(int mdfd, mdu_array_info_t *ainf,
                         mdu_disk_info_t *disk);

-void wait_for(char *dev);
+void wait_for(char *dev, int fd);

 
 #if __GNUC__ < 3
 struct stat64;
 
 #if __GNUC__ < 3
 struct stat64;

diff --git a/util.c b/util.c
index 07738d07ad06a19086d1b0ab07d405b7f3d76104..02fc46339742c6058ae099d729f94728c20982f2 100644 (file)
--- a/util.c
+++ b/util.c
@@ -852,13 +852,20 @@ int same_dev(char *one, char *two)
        return st1.st_rdev == st2.st_rdev;
 }
 
        return st1.st_rdev == st2.st_rdev;
 }
 

-void wait_for(char *dev)
+void wait_for(char *dev, int fd)

 {
        int i;
 {
        int i;

+       struct stat stb_want;
+
+       if (fstat(fd, &stb_want) != 0 ||
+           (stb_want.st_mode & S_IFMT) != S_IFBLK)
+               return;

 
        for (i=0 ; i<25 ; i++) {
                struct stat stb;
 
        for (i=0 ; i<25 ; i++) {
                struct stat stb;

-               if (stat(dev, &stb) == 0)
+               if (stat(dev, &stb) == 0 &&
+                   (stb.st_mode & S_IFMT) == S_IFBLK &&
+                   (stb.st_rdev == stb_want.st_rdev))

                        return;
                usleep(200000);
        }
                        return;
                usleep(200000);
        }