Assemble: don't use O_EXCL until we have checked device content.

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 13adfc3bde5dd92bc75b0837eca76b1535fb891d..0af8ad86f8119b6f5d15e1c7174605814f1231e5 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -310,7 +310,7 @@ int Assemble(struct supertype *st, char *mddev,
 
                tst = dup_super(st);
 
-               dfd = dev_open(devname, O_RDONLY|O_EXCL);
+               dfd = dev_open(devname, O_RDONLY);
                if (dfd < 0) {
                        if (report_missmatch)
                                fprintf(stderr, Name ": cannot open device %s: %s\n",
@@ -408,6 +408,17 @@ int Assemble(struct supertype *st, char *mddev,
                        /* tmpdev is a container.  We need to be either
                         * looking for a member, or auto-assembling
                         */
+                       /* should be safe to try an exclusive open now, we
+                        * have rejected anything that some other mdadm might
+                        * be looking at
+                        */
+                       dfd = dev_open(devname, O_RDONLY | O_EXCL);
+                       if (dfd < 0) {
+                               if (report_missmatch)
+                                       fprintf(stderr, Name ": %s is busy - skipping\n", devname);
+                               goto loop;
+                       }
+                       close(dfd);
 
                        if (ident->container) {
                                if (ident->container[0] == '/' &&
@@ -492,6 +503,18 @@ int Assemble(struct supertype *st, char *mddev,
                                           report_missmatch ? devname : NULL))
                                goto loop;
                                
+                       /* should be safe to try an exclusive open now, we
+                        * have rejected anything that some other mdadm might
+                        * be looking at
+                        */
+                       dfd = dev_open(devname, O_RDONLY | O_EXCL);
+                       if (dfd < 0) {
+                               if (report_missmatch)
+                                       fprintf(stderr, Name ": %s is busy - skipping\n", devname);
+                               goto loop;
+                       }
+                       close(dfd);
+
                        if (st == NULL)
                                st = dup_super(tst);
                        if (st->minor_version == -1)