Remove avail_disks arg from 'enough'.

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index 6985a7076204f6b11cf2b617594d968025ca8307..e5f7a202ba66fd02de8a0bbe5b54bd8b3e931f9e 100644 (file)
--- a/util.c
+++ b/util.c
@@ -32,6 +32,8 @@
 #include       <dirent.h>
 #include       <signal.h>
 
+int __offroot;
+
 /*
  * following taken from linux/blkpg.h because they aren't
  * anywhere else and it isn't safe to #include linux/ * stuff.
@@ -309,10 +311,15 @@ int test_partition_from_id(dev_t id)
        return rv;
 }
 
-int enough(int level, int raid_disks, int layout, int clean,
-          char *avail, int avail_disks)
+int enough(int level, int raid_disks, int layout, int clean, char *avail)
 {
        int copies, first;
+       int i;
+       int avail_disks = 0;
+
+       for (i = 0; i < raid_disks; i++)
+               avail_disks += !!avail[i];
+
        switch (level) {
        case 10:
                /* This is the tricky one - we need to check
@@ -387,7 +394,7 @@ int enough_fd(int fd)
        }
        /* This is used on an active array, so assume it is clean */
        rv = enough(array.level, array.raid_disks, array.layout,
-                   1, avail, avail_disks);
+                   1, avail);
        free(avail);
        return rv;
 }
@@ -1622,10 +1629,17 @@ int start_mdmon(int devnum)
                                skipped = 0;
 
                for (i=0; paths[i]; i++)
-                       if (paths[i][0])
-                               execl(paths[i], "mdmon",
-                                     devnum2devname(devnum),
-                                     NULL);
+                       if (paths[i][0]) {
+                               if (__offroot) {
+                                       execl(paths[i], "mdmon", "--offroot",
+                                             devnum2devname(devnum),
+                                             NULL);
+                               } else {
+                                       execl(paths[i], "mdmon",
+                                             devnum2devname(devnum),
+                                             NULL);
+                               }
+                       }
                exit(1);
        case -1: fprintf(stderr, Name ": cannot run mdmon. "
                         "Array remains readonly\n");