]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Improve opt parsing, and distinguish long from short.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index 6b571d70b51ab33be056fef37f51ddfe19840cf4..24a2790c2c4a912e58cefb1452ef2a1c29324bb2 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *    Author: Neil Brown
- *    Email: <neilb@cse.unsw.edu.au>
- *    Paper: Neil Brown
- *           School of Computer Science and Engineering
- *           The University of New South Wales
- *           Sydney, 2052
- *           Australia
+ *    Email: <neilb@suse.de>
  *
  *    Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004,
  *    Paul Clements, SteelEye Technology, Inc.
@@ -53,12 +48,12 @@ int main(int argc, char *argv[])
        int raiddisks = 0;
        int max_disks = MD_SB_DISKS; /* just a default */
        int sparedisks = 0;
-       struct mddev_ident_s ident;
+       struct mddev_ident ident;
        char *configfile = NULL;
        char *cp;
        char *update = NULL;
        int scan = 0;
-       char devmode = 0;
+       int devmode = 0;
        int runstop = 0;
        int readonly = 0;
        int write_behind = 0;
@@ -67,9 +62,9 @@ int main(int argc, char *argv[])
        char *backup_file = NULL;
        int bitmap_chunk = UnSet;
        int SparcAdjust = 0;
-       mddev_dev_t devlist = NULL;
-       mddev_dev_t *devlistend = & devlist;
-       mddev_dev_t dv;
+       struct mddev_dev *devlist = NULL;
+       struct mddev_dev **devlistend = & devlist;
+       struct mddev_dev *dv;
        int devs_found = 0;
        int verbose = 0;
        int quiet = 0;
@@ -96,10 +91,12 @@ int main(int argc, char *argv[])
        int require_homehost = 1;
        char *mailaddr = NULL;
        char *program = NULL;
+       int increments = 20;
        int delay = 0;
        int daemonise = 0;
        char *pidfile = NULL;
        int oneshot = 0;
+       int spare_sharing = 1;
        struct supertype *ss = NULL;
        int writemostly = 0;
        int re_add = 0;
@@ -107,6 +104,8 @@ int main(int argc, char *argv[])
        int dosyslog = 0;
        int rebuild_map = 0;
        int auto_update_home = 0;
+       char *subarray = NULL;
+       char *remove_path = NULL;
 
        int print_help = 0;
        FILE *outf;
@@ -136,12 +135,11 @@ int main(int argc, char *argv[])
                int newmode = mode;
                /* firstly, some mode-independent options */
                switch(opt) {
+               case HelpOptions:
+                       print_help = 2;
+                       continue;
                case 'h':
-                       if (option_index > 0 &&
-                           strcmp(long_options[option_index].name, "help-options")==0)
-                               print_help = 2;
-                       else
-                               print_help = 1;
+                       print_help = 1;
                        continue;
 
                case 'V':
@@ -155,13 +153,12 @@ int main(int argc, char *argv[])
                        continue;
 
                case 'b':
-                       if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW)
+                       if (mode == ASSEMBLE || mode == BUILD || mode == CREATE
+                           || mode == GROW || mode == INCREMENTAL
+                           || mode == MANAGE)
                                break; /* b means bitmap */
+               case Brief:
                        brief = 1;
-                       if (optarg) {
-                               fprintf(stderr, Name ": -b cannot have any extra immediately after it, sorry.\n");
-                               exit(2);
-                       }
                        continue;
 
                case 'Y': export++;
@@ -185,13 +182,16 @@ int main(int argc, char *argv[])
                 */
 
                switch(opt) {
-               case '@': /* just incase they say --manage */
+               case ManageOpt:
                        newmode = MANAGE;
                        shortopt = short_bitmap_options;
                        break;
                case 'a':
+               case Add:
                case 'r':
+               case Remove:
                case 'f':
+               case Fail:
                case ReAdd: /* re-add */
                        if (!mode) {
                                newmode = MANAGE;
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
                case AutoDetect:
                        newmode = AUTODETECT; break;
 
-               case '#':
+               case MiscOpt:
                case 'D':
                case 'E':
                case 'X':
@@ -221,9 +221,21 @@ int main(int argc, char *argv[])
                case 'o':
                case 'w':
                case 'W':
+               case WaitOpt:
                case Waitclean:
                case DetailPlatform:
+               case KillSubarray:
+               case UpdateSubarray:
+                       if (opt == KillSubarray || opt == UpdateSubarray) {
+                               if (subarray) {
+                                       fprintf(stderr, Name ": subarray can only"
+                                               " be specified once\n");
+                                       exit(2);
+                               }
+                               subarray = optarg;
+                       }
                case 'K': if (!mode) newmode = MISC; break;
+               case NoSharing: newmode = MONITOR; break;
                }
                if (mode && newmode == mode) {
                        /* everybody happy ! */
@@ -242,7 +254,7 @@ int main(int argc, char *argv[])
                        mode = newmode;
                } else {
                        /* special case of -c --help */
-                       if (opt == 'c' &&
+                       if ((opt == 'c' || opt == ConfigFile) &&
                            ( strncmp(optarg, "--h", 3)==0 ||
                              strncmp(optarg, "-h", 2)==0)) {
                                fputs(Help_config, stdout);
@@ -262,7 +274,6 @@ int main(int argc, char *argv[])
                                        dv->writemostly = writemostly;
                                        dv->re_add = re_add;
                                        dv->used = 0;
-                                       dv->content = NULL;
                                        dv->next = NULL;
                                        *devlistend = dv;
                                        devlistend = &dv->next;
@@ -271,7 +282,8 @@ int main(int argc, char *argv[])
                                        continue;
                                }
                                /* No mode yet, and this is the second device ... */
-                               fprintf(stderr, Name ": An option must be given to set the mode before a second device is listed\n");
+                               fprintf(stderr, Name ": An option must be given to set the mode before a second device\n"
+                                       "       (%s) is listed\n", optarg);
                                exit(2);
                        }
                        if (option_index >= 0)
@@ -284,8 +296,8 @@ int main(int argc, char *argv[])
 
                /* if we just set the mode, then done */
                switch(opt) {
-               case '@':
-               case '#':
+               case ManageOpt:
+               case MiscOpt:
                case 'A':
                case 'B':
                case 'C':
@@ -298,12 +310,14 @@ int main(int argc, char *argv[])
                if (opt == 1) {
                        /* an undecorated option - must be a device name.
                         */
-                       if (devs_found > 0 && mode == '@' && !devmode) {
-                               fprintf(stderr, Name ": Must give one of -a/-r/-f for subsequent devices at %s\n", optarg);
+                       if (devs_found > 0 && mode == MANAGE && !devmode) {
+                               fprintf(stderr, Name ": Must give one of -a/-r/-f"
+                                       " for subsequent devices at %s\n", optarg);
                                exit(2);
                        }
-                       if (devs_found > 0 && mode == 'G' && !devmode) {
-                               fprintf(stderr, Name ": Must give one of -a for devices do add: %s\n", optarg);
+                       if (devs_found > 0 && mode == GROW && !devmode) {
+                               fprintf(stderr, Name ": Must give -a/--add for"
+                                       " devices to add: %s\n", optarg);
                                exit(2);
                        }
                        dv = malloc(sizeof(*dv));
@@ -316,7 +330,6 @@ int main(int argc, char *argv[])
                        dv->writemostly = writemostly;
                        dv->re_add = re_add;
                        dv->used = 0;
-                       dv->content = NULL;
                        dv->next = NULL;
                        *devlistend = dv;
                        devlistend = &dv->next;
@@ -327,11 +340,14 @@ int main(int argc, char *argv[])
 
                /* We've got a mode, and opt is now something else which
                 * could depend on the mode */
-#define O(a,b) ((a<<8)|b)
+#define O(a,b) ((a<<16)|b)
                switch (O(mode,opt)) {
                case O(GROW,'c'):
+               case O(GROW,ChunkSize):
                case O(CREATE,'c'):
+               case O(CREATE,ChunkSize):
                case O(BUILD,'c'): /* chunk or rounding */
+               case O(BUILD,ChunkSize): /* chunk or rounding */
                        if (chunk) {
                                fprintf(stderr, Name ": chunk/rounding may only be specified once. "
                                        "Second value is %s.\n", optarg);
@@ -345,9 +361,11 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+#if 0
                case O(ASSEMBLE,AutoHomeHost):
                        auto_update_home = 1;
                        continue;
+#endif
                case O(INCREMENTAL, 'e'):
                case O(CREATE,'e'):
                case O(ASSEMBLE,'e'):
@@ -367,8 +385,11 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(MANAGE,'W'):
+               case O(MANAGE,WriteMostly):
                case O(BUILD,'W'):
+               case O(BUILD,WriteMostly):
                case O(CREATE,'W'):
+               case O(CREATE,WriteMostly):
                        /* set write-mostly for following devices */
                        writemostly = 1;
                        continue;
@@ -433,7 +454,10 @@ int main(int argc, char *argv[])
                                        optarg);
                                exit(2);
                        }
-                       if (level != 0 && level != -1 && level != 1 && level != -4 && level != -5 && mode == BUILD) {
+                       if (level != 0 && level != LEVEL_LINEAR && level != 1 &&
+                           level != LEVEL_MULTIPATH && level != LEVEL_FAULTY &&
+                           level != 10 &&
+                           mode == BUILD) {
                                fprintf(stderr, Name ": Raid level %s not permitted with --build.\n",
                                        optarg);
                                exit(2);
@@ -447,6 +471,7 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(GROW, 'p'): /* new layout */
+               case O(GROW, Layout):
                        if (layout_str) {
                                fprintf(stderr,Name ": layout may only be sent once.  "
                                        "Second value was %s\n", optarg);
@@ -457,7 +482,9 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(CREATE,'p'): /* raid5 layout */
+               case O(CREATE,Layout):
                case O(BUILD,'p'): /* faulty layout */
+               case O(BUILD,Layout):
                        if (layout != UnSet) {
                                fprintf(stderr,Name ": layout may only be sent once.  "
                                        "Second value was %s\n", optarg);
@@ -552,9 +579,13 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(CREATE,'a'):
+               case O(CREATE,Auto):
                case O(BUILD,'a'):
+               case O(BUILD,Auto):
                case O(INCREMENTAL,'a'):
-               case O(ASSEMBLE,'a'): /* auto-creation of device node */
+               case O(INCREMENTAL,Auto):
+               case O(ASSEMBLE,'a'):
+               case O(ASSEMBLE,Auto): /* auto-creation of device node */
                        autof = parse_auto(optarg, "--auto flag", 0);
                        continue;
 
@@ -565,10 +596,15 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(BUILD,'f'): /* force honouring '-n 1' */
+               case O(BUILD,Force): /* force honouring '-n 1' */
                case O(GROW,'f'): /* ditto */
+               case O(GROW,Force): /* ditto */
                case O(CREATE,'f'): /* force honouring of device list */
+               case O(CREATE,Force): /* force honouring of device list */
                case O(ASSEMBLE,'f'): /* force assembly */
+               case O(ASSEMBLE,Force): /* force assembly */
                case O(MISC,'f'): /* force zero */
+               case O(MISC,Force): /* force zero */
                        force=1;
                        continue;
 
@@ -590,11 +626,16 @@ int main(int argc, char *argv[])
 
                case O(CREATE,'N'):
                case O(ASSEMBLE,'N'):
+               case O(MISC,'N'):
                        if (ident.name[0]) {
                                fprintf(stderr, Name ": name cannot be set twice.   "
                                        "Second value %s.\n", optarg);
                                exit(2);
                        }
+                       if (mode == MISC && !subarray) {
+                               fprintf(stderr, Name ": -N/--name only valid with --update-subarray in misc mode\n");
+                               exit(2);
+                       }
                        if (strlen(optarg) > 32) {
                                fprintf(stderr, Name ": name '%s' is too long, 32 chars max.\n",
                                        optarg);
@@ -604,6 +645,7 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(ASSEMBLE,'m'): /* super-minor for array */
+               case O(ASSEMBLE,SuperMinor):
                        if (ident.super_minor != UnSet) {
                                fprintf(stderr, Name ": super-minor cannot be set twice.  "
                                        "Second value: %s.\n", optarg);
@@ -621,11 +663,16 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(ASSEMBLE,'U'): /* update the superblock */
+               case O(MISC,'U'):
                        if (update) {
                                fprintf(stderr, Name ": Can only update one aspect of superblock, both %s and %s given.\n",
                                        update, optarg);
                                exit(2);
                        }
+                       if (mode == MISC && !subarray) {
+                               fprintf(stderr, Name ": Only subarrays can be updated in misc mode\n");
+                               exit(2);
+                       }
                        update = optarg;
                        if (strcmp(update, "sparc2.2")==0)
                                continue;
@@ -673,15 +720,20 @@ int main(int argc, char *argv[])
                        exit(outf == stdout ? 0 : 2);
 
                case O(INCREMENTAL,NoDegraded):
+                       fprintf(stderr, Name ": --no-degraded is deprecated in Incremental mode\n");
                case O(ASSEMBLE,NoDegraded): /* --no-degraded */
                        runstop = -1; /* --stop isn't allowed for --assemble,
                                       * so we overload slightly */
                        continue;
 
-               case O(ASSEMBLE,'c'): /* config file */
+               case O(ASSEMBLE,'c'):
+               case O(ASSEMBLE,ConfigFile):
                case O(INCREMENTAL, 'c'):
+               case O(INCREMENTAL, ConfigFile):
                case O(MISC, 'c'):
+               case O(MISC, ConfigFile):
                case O(MONITOR,'c'):
+               case O(MONITOR,ConfigFile):
                        if (configfile) {
                                fprintf(stderr, Name ": configfile cannot be set twice.  "
                                        "Second value is %s.\n", optarg);
@@ -699,6 +751,7 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(MONITOR,'m'): /* mail address */
+               case O(MONITOR,EMail):
                        if (mailaddr)
                                fprintf(stderr, Name ": only specify one mailaddress. %s ignored.\n",
                                        optarg);
@@ -707,6 +760,7 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(MONITOR,'p'): /* alert program */
+               case O(MONITOR,ProgramOpt): /* alert program */
                        if (program)
                                fprintf(stderr, Name ": only specify one alter program. %s ignored.\n",
                                        optarg);
@@ -714,6 +768,15 @@ int main(int argc, char *argv[])
                                program = optarg;
                        continue;
 
+               case O(MONITOR,'r'): /* rebuild increments */
+               case O(MONITOR,Increment):
+                       increments = atoi(optarg);
+                       if (increments>99 || increments<1) {
+                               fprintf(stderr, Name ": please specify positive integer between 1 and 99 as rebuild increments.\n");
+                               exit(2);
+                       }
+                       continue;
+
                case O(MONITOR,'d'): /* delay in seconds */
                case O(GROW, 'd'):
                case O(BUILD,'d'): /* delay for bitmap updates */
@@ -731,6 +794,7 @@ int main(int argc, char *argv[])
                        }
                        continue;
                case O(MONITOR,'f'): /* daemonise */
+               case O(MONITOR,Fork):
                        daemonise = 1;
                        continue;
                case O(MONITOR,'i'): /* pid */
@@ -750,12 +814,16 @@ int main(int argc, char *argv[])
                        openlog("mdadm", LOG_PID, SYSLOG_FACILITY);
                        dosyslog = 1;
                        continue;
-
+               case O(MONITOR, NoSharing):
+                       spare_sharing = 0;
+                       continue;
                        /* now the general management options.  Some are applicable
                         * to other modes. None have arguments.
                         */
                case O(GROW,'a'):
-               case O(MANAGE,'a'): /* add a drive */
+               case O(GROW,Add):
+               case O(MANAGE,'a'):
+               case O(MANAGE,Add): /* add a drive */
                        devmode = 'a';
                        re_add = 0;
                        continue;
@@ -764,9 +832,16 @@ int main(int argc, char *argv[])
                        re_add = 1;
                        continue;
                case O(MANAGE,'r'): /* remove a drive */
+               case O(MANAGE,Remove):
                        devmode = 'r';
                        continue;
                case O(MANAGE,'f'): /* set faulty */
+               case O(MANAGE,Fail):
+               case O(INCREMENTAL,'f'):
+               case O(INCREMENTAL,Remove):
+               case O(INCREMENTAL,Fail): /* r for incremental is taken, use f
+                                         * even though we will both fail and
+                                         * remove the device */
                        devmode = 'f';
                        continue;
                case O(INCREMENTAL,'R'):
@@ -787,6 +862,9 @@ int main(int argc, char *argv[])
                        }
                        runstop = -1;
                        continue;
+               case O(MANAGE,'t'):
+                       test = 1;
+                       continue;
 
                case O(MISC,'Q'):
                case O(MISC,'D'):
@@ -798,12 +876,24 @@ int main(int argc, char *argv[])
                case O(MISC,'o'):
                case O(MISC,'w'):
                case O(MISC,'W'):
+               case O(MISC, WaitOpt):
                case O(MISC, Waitclean):
                case O(MISC, DetailPlatform):
+               case O(MISC, KillSubarray):
+               case O(MISC, UpdateSubarray):
                        if (devmode && devmode != opt &&
                            (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) {
-                               fprintf(stderr, Name ": --examine/-E cannot be given with -%c\n",
-                                       devmode =='E'?opt:devmode);
+                               fprintf(stderr, Name ": --examine/-E cannot be given with ");
+                               if (devmode == 'E') {
+                                       if (option_index >= 0)
+                                               fprintf(stderr, "--%s\n",
+                                                       long_options[option_index].name);
+                                       else
+                                               fprintf(stderr, "-%c\n", opt);
+                               } else if (isalpha(devmode))
+                                       fprintf(stderr, "-%c\n", devmode);
+                               else
+                                       fprintf(stderr, "previous option\n");
                                exit(2);
                        }
                        devmode = opt;
@@ -821,6 +911,7 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(ASSEMBLE,'b'): /* here we simply set the bitmap file */
+               case O(ASSEMBLE,Bitmap):
                        if (!optarg) {
                                fprintf(stderr, Name ": bitmap file needed with -b in --assemble mode\n");
                                exit(2);
@@ -850,7 +941,9 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(BUILD,'b'):
-               case O(CREATE,'b'): /* here we create the bitmap */
+               case O(BUILD,Bitmap):
+               case O(CREATE,'b'):
+               case O(CREATE,Bitmap): /* here we create the bitmap */
                        if (strcmp(optarg, "none") == 0) {
                                fprintf(stderr, Name ": '--bitmap none' only"
                                        " support for --grow\n");
@@ -858,6 +951,7 @@ int main(int argc, char *argv[])
                        }
                        /* FALL THROUGH */
                case O(GROW,'b'):
+               case O(GROW,Bitmap):
                        if (strcmp(optarg, "internal")== 0 ||
                            strcmp(optarg, "none")== 0 ||
                            strchr(optarg, '/') != NULL) {
@@ -865,7 +959,8 @@ int main(int argc, char *argv[])
                                continue;
                        }
                        /* probable typo */
-                       fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n");
+                       fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n"
+                               "       not '%s'\n", optarg);
                        exit(2);
 
                case O(GROW,BitmapChunk):
@@ -897,8 +992,12 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(INCREMENTAL, 'r'):
+               case O(INCREMENTAL, RebuildMapOpt):
                        rebuild_map = 1;
                        continue;
+               case O(INCREMENTAL, IncrementalPath):
+                       remove_path = optarg;
+                       continue;
                }
                /* We have now processed all the valid options. Anything else is
                 * an error
@@ -1038,6 +1137,12 @@ int main(int argc, char *argv[])
                }
        }
 
+       if ((mode != MISC || devmode != 'E') &&
+           geteuid() != 0) {
+               fprintf(stderr, Name ": must be super-user to perform this action\n");
+               exit(1);
+       }
+
        ident.autof = autof;
 
        rv = 0;
@@ -1048,7 +1153,7 @@ int main(int argc, char *argv[])
                        rv = Manage_ro(devlist->devname, mdfd, readonly);
                if (!rv && devs_found>1)
                        rv = Manage_subdevs(devlist->devname, mdfd,
-                                           devlist->next, verbose-quiet);
+                                           devlist->next, verbose-quiet, test);
                if (!rv && readonly < 0)
                        rv = Manage_ro(devlist->devname, mdfd, readonly);
                if (!rv && runstop)
@@ -1058,7 +1163,7 @@ int main(int argc, char *argv[])
                if (devs_found == 1 && ident.uuid_set == 0 &&
                    ident.super_minor == UnSet && ident.name[0] == 0 && !scan ) {
                        /* Only a device has been given, so get details from config file */
-                       mddev_ident_t array_ident = conf_get_ident(devlist->devname);
+                       struct mddev_ident *array_ident = conf_get_ident(devlist->devname);
                        if (array_ident == NULL) {
                                fprintf(stderr, Name ": %s not identified in config file.\n",
                                        devlist->devname);
@@ -1090,7 +1195,7 @@ int main(int argc, char *argv[])
                                exit(1);
                        }
                        for (dv = devlist ; dv ; dv=dv->next) {
-                               mddev_ident_t array_ident = conf_get_ident(dv->devname);
+                               struct mddev_ident *array_ident = conf_get_ident(dv->devname);
                                if (array_ident == NULL) {
                                        fprintf(stderr, Name ": %s not identified in config file.\n",
                                                dv->devname);
@@ -1106,9 +1211,10 @@ int main(int argc, char *argv[])
                                               verbose-quiet, force);
                        }
                } else {
-                       mddev_ident_t array_list =  conf_get_ident(NULL);
-                       mddev_dev_t devlist = conf_get_devs();
+                       struct mddev_ident *a, *array_list =  conf_get_ident(NULL);
+                       struct mddev_dev *devlist = conf_get_devs();
                        int cnt = 0;
+                       int failures, successes;
                        if (devlist == NULL) {
                                fprintf(stderr, Name ": No devices listed in conf file were found.\n");
                                exit(1);
@@ -1121,21 +1227,38 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n");
                                exit(1);
                        }
-                       for (; array_list; array_list = array_list->next) {
-                               if (array_list->devname &&
-                                   strcasecmp(array_list->devname, "<ignore>") == 0)
-                                       continue;
-                               if (array_list->autof == 0)
-                                       array_list->autof = autof;
+                       for (a = array_list; a ; a = a->next) {
+                               a->assembled = 0;
+                               if (a->autof == 0)
+                                       a->autof = autof;
+                       }
+                       do {
+                               failures = 0;
+                               successes = 0;
+                               rv = 0;
+                               for (a = array_list; a ; a = a->next) {
+                                       int r;
+                                       if (a->assembled)
+                                               continue;
+                                       if (a->devname &&
+                                           strcasecmp(a->devname, "<ignore>") == 0)
+                                               continue;
                                
-                               rv |= Assemble(ss, array_list->devname,
-                                              array_list,
-                                              NULL, NULL,
-                                              readonly, runstop, NULL,
-                                              homehost, require_homehost,
-                                              verbose-quiet, force);
-                               cnt++;
-                       }
+                                       r = Assemble(ss, a->devname,
+                                                    a,
+                                                    NULL, NULL,
+                                                    readonly, runstop, NULL,
+                                                    homehost, require_homehost,
+                                                    verbose-quiet, force);
+                                       if (r == 0) {
+                                               a->assembled = 1;
+                                               successes++;
+                                       } else
+                                               failures++;
+                                       rv |= r;
+                                       cnt++;
+                               }
+                       } while (failures && successes);
                        if (homehost && cnt == 0) {
                                /* Maybe we can auto-assemble something.
                                 * Repeatedly call Assemble in auto-assemble mode
@@ -1145,7 +1268,7 @@ int main(int argc, char *argv[])
                                int acnt;
                                ident.autof = autof;
                                do {
-                                       mddev_dev_t devlist = conf_get_devs();
+                                       struct mddev_dev *devlist = conf_get_devs();
                                        acnt = 0;
                                        do {
                                                rv2 = Assemble(ss, NULL,
@@ -1166,6 +1289,7 @@ int main(int argc, char *argv[])
                                        } while (rv2!=2);
                                        /* Incase there are stacked devices, we need to go around again */
                                } while (acnt);
+#if 0
                                if (cnt == 0 && auto_update_home && homehost) {
                                        /* Nothing found, maybe we need to bootstrap homehost info */
                                        do {
@@ -1185,6 +1309,7 @@ int main(int argc, char *argv[])
                                                /* Incase there are stacked devices, we need to go around again */
                                        } while (acnt);
                                }
+#endif
                                if (cnt == 0 && rv == 0) {
                                        fprintf(stderr, Name ": No arrays found in config file or automatically\n");
                                        rv = 1;
@@ -1268,11 +1393,18 @@ int main(int argc, char *argv[])
                                        struct mdstat_ent *ms = mdstat_read(0, 1);
                                        struct mdstat_ent *e;
                                        struct map_ent *map = NULL;
+                                       int members;
                                        int v = verbose>1?0:verbose+1;
 
+                                       for (members = 0; members <= 1; members++) {
                                        for (e=ms ; e ; e=e->next) {
                                                char *name;
                                                struct map_ent *me;
+                                               int member = e->metadata_version &&
+                                                       strncmp(e->metadata_version,
+                                                               "external:/", 10) == 0;
+                                               if (members != member)
+                                                       continue;
                                                me = map_by_devnum(&map, e->devnum);
                                                if (me && me->path
                                                    && strcmp(me->path, "/unknown") != 0)
@@ -1290,9 +1422,10 @@ int main(int argc, char *argv[])
                                                                     export, test,
                                                                     homehost);
                                                else
-                                                       rv |= WaitClean(name, v);
+                                                       rv |= WaitClean(name, -1, v);
                                                put_md_name(name);
                                        }
+                                       }
                                        free_mdstat(ms);
                                } else  if (devmode == 'S' && scan) {
                                        /* apply --stop to all devices in /proc/mdstat */
@@ -1342,16 +1475,38 @@ int main(int argc, char *argv[])
                                                     export, test, homehost);
                                        continue;
                                case 'K': /* Zero superblock */
-                                       rv |= Kill(dv->devname, force, quiet,0);
+                                       if (ss)
+                                               rv |= Kill(dv->devname, ss, force, quiet,0);
+                                       else {
+                                               int q = quiet;
+                                               do {
+                                                       rv |= Kill(dv->devname, NULL, force, q, 0);
+                                                       q = 1;
+                                               } while (rv == 0);
+                                               rv &= ~2;
+                                       }
                                        continue;
                                case 'Q':
                                        rv |= Query(dv->devname); continue;
                                case 'X':
                                        rv |= ExamineBitmap(dv->devname, brief, ss); continue;
                                case 'W':
+                               case WaitOpt:
                                        rv |= Wait(dv->devname); continue;
                                case Waitclean:
-                                       rv |= WaitClean(dv->devname, verbose-quiet); continue;
+                                       rv |= WaitClean(dv->devname, -1, verbose-quiet); continue;
+                               case KillSubarray:
+                                       rv |= Kill_subarray(dv->devname, subarray, quiet);
+                                       continue;
+                               case UpdateSubarray:
+                                       if (update == NULL) {
+                                               fprintf(stderr,
+                                                       Name ": -U/--update must be specified with --update-subarray\n");
+                                               rv |= 1;
+                                               continue;
+                                       }
+                                       rv |= Update_subarray(dv->devname, subarray, update, &ident, quiet);
+                                       continue;
                                }
                                mdfd = open_mddev(dv->devname, 1);
                                if (mdfd>=0) {
@@ -1382,18 +1537,34 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (delay == 0) {
+                       if (get_linux_version() > 2006016)
+                               /* mdstat responds to poll */
+                               delay = 1000;
+                       else
+                               delay = 60;
+               }
                rv= Monitor(devlist, mailaddr, program,
                            delay?delay:60, daemonise, scan, oneshot,
-                           dosyslog, test, pidfile);
+                           dosyslog, test, pidfile, increments, spare_sharing);
                break;
 
        case GROW:
                if (array_size >= 0) {
                        /* alway impose array size first, independent of
                         * anything else
+                        * Do not allow level or raid_disks changes at the
+                        * same time as that can be irreversibly destructive.
                         */
                        struct mdinfo sra;
                        int err;
+                       if (raiddisks || level != UnSet) {
+                               fprintf(stderr, Name ": cannot change array size in same operation "
+                                       "as changing raiddisks or level.\n"
+                                       "    Change size first, then check that data is still intact.\n");
+                               rv = 1;
+                               break;
+                       }
                        sysfs_init(&sra, mdfd, 0);
                        if (array_size == 0)
                                err = sysfs_set_str(&sra, NULL, "array_size", "default");
@@ -1450,6 +1621,11 @@ int main(int argc, char *argv[])
                         ": --incremental --scan meaningless without --run.\n");
                                break;
                        }
+                       if (devmode == 'f') {
+                               fprintf(stderr, Name
+                        ": --incremental --scan --fail not supported.\n");
+                               break;
+                       }
                        rv = IncrementalScan(verbose);
                }
                if (!devlist) {
@@ -1466,8 +1642,13 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
-               rv = Incremental(devlist->devname, verbose-quiet, runstop,
-                                ss, homehost, require_homehost, autof);
+               if (devmode == 'f')
+                       rv = IncrementalRemove(devlist->devname, remove_path,
+                                              verbose-quiet);
+               else
+                       rv = Incremental(devlist->devname, verbose-quiet,
+                                        runstop, ss, homehost,
+                                        require_homehost, autof);
                break;
        case AUTODETECT:
                autodetect();