]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Don't break long strings onto multiple lines.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index 870e5376b5bb38414ca25bec5a27eabbe063249a..3e8c49b5931126dc1225c51168d8ebf40c372060 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2012 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,6 @@
 #include "md_p.h"
 #include <ctype.h>
 
-
 static int scan_assemble(struct supertype *ss,
                         struct context *c,
                         struct mddev_ident *ident);
@@ -37,8 +36,9 @@ static int misc_scan(char devmode, struct context *c);
 static int stop_scan(int verbose);
 static int misc_list(struct mddev_dev *devlist,
                     struct mddev_ident *ident,
+                    char *dump_directory,
                     struct supertype *ss, struct context *c);
-
+const char Name[] = "mdadm";
 
 int main(int argc, char *argv[])
 {
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
        int i;
 
        unsigned long long array_size = 0;
+       unsigned long long data_offset = INVALID_SECTORS;
        struct mddev_ident ident;
        char *configfile = NULL;
        int devmode = 0;
@@ -93,6 +94,7 @@ int main(int argc, char *argv[])
        int rebuild_map = 0;
        char *remove_path = NULL;
        char *udev_filename = NULL;
+       char *dump_directory = NULL;
 
        int print_help = 0;
        FILE *outf;
@@ -158,14 +160,8 @@ int main(int argc, char *argv[])
                                c.homehost = optarg;
                        continue;
 
-               /*
-                * --offroot sets first char of argv[0] to @. This is used
-                * by systemd to signal that the task was launched from
-                * initrd/initramfs and should be preserved during shutdown
-                */
                case OffRootOpt:
-                       argv[0][0] = '@';
-                       __offroot = 1;
+                       /* Silently ignore old option */
                        continue;
 
                case Prefer:
@@ -192,8 +188,11 @@ int main(int argc, char *argv[])
                        break;
                case 'a':
                case Add:
+               case AddSpare:
                case 'r':
                case Remove:
+               case Replace:
+               case With:
                case 'f':
                case Fail:
                case ReAdd: /* re-add */
@@ -229,6 +228,10 @@ int main(int argc, char *argv[])
                case 'E':
                case 'X':
                case 'Q':
+               case ExamineBB:
+               case Dump:
+               case Restore:
+               case Action:
                        newmode = MISC;
                        break;
 
@@ -270,7 +273,7 @@ int main(int argc, char *argv[])
                        if (mode == MISC && devs_found) {
                                pr_err("No action given for %s in --misc mode\n",
                                        devlist->devname);
-                               fprintf(stderr,"       Action options must come before device names\n");
+                               cont_err("Action options must come before device names\n");
                                exit(2);
                        }
                } else {
@@ -334,13 +337,11 @@ int main(int argc, char *argv[])
                        }
 
                        if (devs_found > 0 && mode == MANAGE && !devmode) {
-                               pr_err("Must give one of -a/-r/-f"
-                                       " for subsequent devices at %s\n", optarg);
+                               pr_err("Must give one of -a/-r/-f for subsequent devices at %s\n", optarg);
                                exit(2);
                        }
                        if (devs_found > 0 && mode == GROW && !devmode) {
-                               pr_err("Must give -a/--add for"
-                                      " devices to add: %s\n", optarg);
+                               pr_err("Must give -a/--add for devices to add: %s\n", optarg);
                                exit(2);
                        }
                        dv = xmalloc(sizeof(*dv));
@@ -367,12 +368,12 @@ int main(int argc, char *argv[])
                case O(BUILD,'c'): /* chunk or rounding */
                case O(BUILD,ChunkSize): /* chunk or rounding */
                        if (s.chunk) {
-                               pr_err("chunk/rounding may only be specified once. "
-                                       "Second value is %s.\n", optarg);
+                               pr_err("chunk/rounding may only be specified once. Second value is %s.\n", optarg);
                                exit(2);
                        }
                        s.chunk = parse_size(optarg);
-                       if (s.chunk < 8 || (s.chunk&1)) {
+                       if (s.chunk == INVALID_SECTORS ||
+                           s.chunk < 8 || (s.chunk&1)) {
                                pr_err("invalid chunk/rounding value: %s\n",
                                        optarg);
                                exit(2);
@@ -413,20 +414,19 @@ int main(int argc, char *argv[])
                        writemostly = 2;
                        continue;
 
-
                case O(GROW,'z'):
                case O(CREATE,'z'):
                case O(BUILD,'z'): /* size */
                        if (s.size > 0) {
-                               pr_err("size may only be specified once. "
-                                       "Second value is %s.\n", optarg);
+                               pr_err("size may only be specified once. Second value is %s.\n", optarg);
                                exit(2);
                        }
                        if (strcmp(optarg, "max")==0)
                                s.size = MAX_SIZE;
                        else {
                                s.size = parse_size(optarg);
-                               if (s.size < 8) {
+                               if (s.size == INVALID_SECTORS ||
+                                   s.size < 8) {
                                        pr_err("invalid size: %s\n",
                                                optarg);
                                        exit(2);
@@ -438,15 +438,15 @@ int main(int argc, char *argv[])
 
                case O(GROW,'Z'): /* array size */
                        if (array_size > 0) {
-                               pr_err("array-size may only be specified once. "
-                                       "Second value is %s.\n", optarg);
+                               pr_err("array-size may only be specified once. Second value is %s.\n", optarg);
                                exit(2);
                        }
                        if (strcmp(optarg, "max") == 0)
                                array_size = MAX_SIZE;
                        else {
                                array_size = parse_size(optarg);
-                               if (array_size <= 0) {
+                               if (array_size == 0 ||
+                                   array_size == INVALID_SECTORS) {
                                        pr_err("invalid array size: %s\n",
                                                optarg);
                                        exit(2);
@@ -454,12 +454,29 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case O(CREATE,DataOffset):
+               case O(GROW,DataOffset):
+                       if (data_offset != INVALID_SECTORS) {
+                               pr_err("data-offset may only be specified one. Second value is %s.\n", optarg);
+                               exit(2);
+                       }
+                       if (mode == CREATE &&
+                           strcmp(optarg, "variable") == 0)
+                               data_offset = VARIABLE_OFFSET;
+                       else
+                               data_offset = parse_size(optarg);
+                       if (data_offset == INVALID_SECTORS) {
+                               pr_err("invalid data-offset: %s\n",
+                                       optarg);
+                               exit(2);
+                       }
+                       continue;
+
                case O(GROW,'l'):
                case O(CREATE,'l'):
                case O(BUILD,'l'): /* set raid level*/
                        if (s.level != UnSet) {
-                               pr_err("raid level may only be set once.  "
-                                       "Second value is %s.\n", optarg);
+                               pr_err("raid level may only be set once.  Second value is %s.\n", optarg);
                                exit(2);
                        }
                        s.level = map_name(pers, optarg);
@@ -487,8 +504,7 @@ int main(int argc, char *argv[])
                case O(GROW, 'p'): /* new layout */
                case O(GROW, Layout):
                        if (s.layout_str) {
-                               pr_err("layout may only be sent once.  "
-                                      "Second value was %s\n", optarg);
+                               pr_err("layout may only be sent once.  Second value was %s\n", optarg);
                                exit(2);
                        }
                        s.layout_str = optarg;
@@ -500,8 +516,7 @@ int main(int argc, char *argv[])
                case O(BUILD,'p'): /* faulty layout */
                case O(BUILD,Layout):
                        if (s.layout != UnSet) {
-                               pr_err("layout may only be sent once.  "
-                                      "Second value was %s\n", optarg);
+                               pr_err("layout may only be sent once.  Second value was %s\n", optarg);
                                exit(2);
                        }
                        switch(s.level) {
@@ -632,8 +647,7 @@ int main(int argc, char *argv[])
                case O(CREATE,'u'): /* uuid of array */
                case O(ASSEMBLE,'u'): /* uuid of array */
                        if (ident.uuid_set) {
-                               pr_err("uuid cannot be set twice.  "
-                                       "Second value %s.\n", optarg);
+                               pr_err("uuid cannot be set twice.  Second value %s.\n", optarg);
                                exit(2);
                        }
                        if (parse_uuid(optarg, ident.uuid))
@@ -648,8 +662,7 @@ int main(int argc, char *argv[])
                case O(ASSEMBLE,'N'):
                case O(MISC,'N'):
                        if (ident.name[0]) {
-                               pr_err("name cannot be set twice.   "
-                                       "Second value %s.\n", optarg);
+                               pr_err("name cannot be set twice.   Second value %s.\n", optarg);
                                exit(2);
                        }
                        if (mode == MISC && !c.subarray) {
@@ -667,8 +680,7 @@ int main(int argc, char *argv[])
                case O(ASSEMBLE,'m'): /* super-minor for array */
                case O(ASSEMBLE,SuperMinor):
                        if (ident.super_minor != UnSet) {
-                               pr_err("super-minor cannot be set twice.  "
-                                       "Second value: %s.\n", optarg);
+                               pr_err("super-minor cannot be set twice.  Second value: %s.\n", optarg);
                                exit(2);
                        }
                        if (strcmp(optarg, "dev")==0)
@@ -691,14 +703,12 @@ int main(int argc, char *argv[])
                case O(ASSEMBLE,'U'): /* update the superblock */
                case O(MISC,'U'):
                        if (c.update) {
-                               pr_err("Can only update one aspect"
-                                       " of superblock, both %s and %s given.\n",
+                               pr_err("Can only update one aspect of superblock, both %s and %s given.\n",
                                        c.update, optarg);
                                exit(2);
                        }
                        if (mode == MISC && !c.subarray) {
-                               pr_err("Only subarrays can be"
-                                       " updated in misc mode\n");
+                               pr_err("Only subarrays can be updated in misc mode\n");
                                exit(2);
                        }
                        c.update = optarg;
@@ -724,18 +734,20 @@ int main(int argc, char *argv[])
                                continue;
                        if (strcmp(c.update, "no-bbl") == 0)
                                continue;
+                       if (strcmp(c.update, "metadata") == 0)
+                               continue;
+                       if (strcmp(c.update, "revert-reshape") == 0)
+                               continue;
                        if (strcmp(c.update, "byteorder")==0) {
                                if (ss) {
-                                       pr_err("must not set metadata"
-                                              " type with --update=byteorder.\n");
+                                       pr_err("must not set metadata type with --update=byteorder.\n");
                                        exit(2);
                                }
                                for(i=0; !ss && superlist[i]; i++)
                                        ss = superlist[i]->match_metadata_desc(
                                                "0.swap");
                                if (!ss) {
-                                       pr_err("INTERNAL ERROR"
-                                               " cannot find 0.swap\n");
+                                       pr_err("INTERNAL ERROR cannot find 0.swap\n");
                                        exit(2);
                                }
 
@@ -744,29 +756,29 @@ int main(int argc, char *argv[])
                        if (strcmp(c.update,"?") == 0 ||
                            strcmp(c.update, "help") == 0) {
                                outf = stdout;
-                               fprintf(outf, Name ": ");
+                               fprintf(outf, "%s: ", Name);
                        } else {
                                outf = stderr;
                                fprintf(outf,
-                                       Name ": '--update=%s' is invalid.  ",
-                                       c.update);
+                                       "%s: '--update=%s' is invalid.  ",
+                                       Name, c.update);
                        }
                        fprintf(outf, "Valid --update options are:\n"
                "     'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n"
                "     'summaries', 'homehost', 'byteorder', 'devicesize',\n"
-               "     'no-bitmap'\n");
+               "     'no-bitmap', 'metadata', 'revert-reshape'\n"
+               "     'bbl', 'no-bbl'\n"
+                               );
                        exit(outf == stdout ? 0 : 2);
 
                case O(MANAGE,'U'):
                        /* update=devicesize is allowed with --re-add */
                        if (devmode != 'A') {
-                               pr_err("--update in Manage mode only"
-                                       " allowed with --re-add.\n");
+                               pr_err("--update in Manage mode only allowed with --re-add.\n");
                                exit(1);
                        }
                        if (c.update) {
-                               pr_err("Can only update one aspect"
-                                       " of superblock, both %s and %s given.\n",
+                               pr_err("Can only update one aspect of superblock, both %s and %s given.\n",
                                        c.update, optarg);
                                exit(2);
                        }
@@ -774,8 +786,7 @@ int main(int argc, char *argv[])
                        if (strcmp(c.update, "devicesize") != 0 &&
                            strcmp(c.update, "bbl") != 0 &&
                            strcmp(c.update, "no-bbl") != 0) {
-                               pr_err("only 'devicesize', 'bbl' and 'no-bbl' can be"
-                                       " updated with --re-add\n");
+                               pr_err("only 'devicesize', 'bbl' and 'no-bbl' can be updated with --re-add\n");
                                exit(2);
                        }
                        continue;
@@ -795,9 +806,9 @@ int main(int argc, char *argv[])
                case O(MISC, ConfigFile):
                case O(MONITOR,'c'):
                case O(MONITOR,ConfigFile):
+               case O(CREATE,ConfigFile):
                        if (configfile) {
-                               pr_err("configfile cannot be set twice.  "
-                                       "Second value is %s.\n", optarg);
+                               pr_err("configfile cannot be set twice.  Second value is %s.\n", optarg);
                                exit(2);
                        }
                        configfile = optarg;
@@ -889,6 +900,9 @@ int main(int argc, char *argv[])
                case O(MANAGE,Add): /* add a drive */
                        devmode = 'a';
                        continue;
+               case O(MANAGE,AddSpare): /* add drive - never re-add */
+                       devmode = 'S';
+                       continue;
                case O(MANAGE,ReAdd):
                        devmode = 'A';
                        continue;
@@ -905,6 +919,18 @@ int main(int argc, char *argv[])
                                           * remove the device */
                        devmode = 'f';
                        continue;
+               case O(MANAGE,Replace):
+                       /* Mark these devices for replacement */
+                       devmode = 'R';
+                       continue;
+               case O(MANAGE,With):
+                       /* These are the replacements to use */
+                       if (devmode != 'R') {
+                               pr_err("--with must follow --replace\n");
+                               exit(2);
+                       }
+                       devmode = 'W';
+                       continue;
                case O(INCREMENTAL,'R'):
                case O(MANAGE,'R'):
                case O(ASSEMBLE,'R'):
@@ -934,6 +960,7 @@ int main(int argc, char *argv[])
                case O(MISC,'R'):
                case O(MISC,'S'):
                case O(MISC,'X'):
+               case O(MISC, ExamineBB):
                case O(MISC,'o'):
                case O(MISC,'w'):
                case O(MISC,'W'):
@@ -942,14 +969,31 @@ int main(int argc, char *argv[])
                case O(MISC, DetailPlatform):
                case O(MISC, KillSubarray):
                case O(MISC, UpdateSubarray):
+               case O(MISC, Dump):
+               case O(MISC, Restore):
+               case O(MISC ,Action):
                        if (opt == KillSubarray || opt == UpdateSubarray) {
                                if (c.subarray) {
-                                       pr_err("subarray can only"
-                                               " be specified once\n");
+                                       pr_err("subarray can only be specified once\n");
                                        exit(2);
                                }
                                c.subarray = optarg;
                        }
+                       if (opt == Action) {
+                               if (c.action) {
+                                       pr_err("Only one --action can be specified\n");
+                                       exit(2);
+                               }
+                               if (strcmp(optarg, "idle") == 0 ||
+                                   strcmp(optarg, "frozen") == 0 ||
+                                   strcmp(optarg, "check") == 0 ||
+                                   strcmp(optarg, "repair") == 0)
+                                       c.action = optarg;
+                               else {
+                                       pr_err("action must be one of idle, frozen, check, repair\n");
+                                       exit(2);
+                               }
+                       }
                        if (devmode && devmode != opt &&
                            (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) {
                                pr_err("--examine/-E cannot be given with ");
@@ -966,15 +1010,21 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        devmode = opt;
+                       if (opt == Dump || opt == Restore) {
+                               if (dump_directory != NULL) {
+                                       pr_err("dump/restore directory specified twice: %s and %s\n",
+                                              dump_directory, optarg);
+                                       exit(2);
+                               }
+                               dump_directory = optarg;
+                       }
                        continue;
                case O(MISC, UdevRules):
                        if (devmode && devmode != opt) {
-                               pr_err("--udev-rules must"
-                                      " be the only option.\n");
+                               pr_err("--udev-rules must be the only option.\n");
                        } else {
                                if (udev_filename)
-                                       pr_err("only specify one udev "
-                                               "rule filename. %s ignored.\n",
+                                       pr_err("only specify one udev rule filename. %s ignored.\n",
                                                optarg);
                                else
                                        udev_filename = optarg;
@@ -1039,12 +1089,6 @@ int main(int argc, char *argv[])
                case O(BUILD,Bitmap):
                case O(CREATE,'b'):
                case O(CREATE,Bitmap): /* here we create the bitmap */
-                       if (strcmp(optarg, "none") == 0) {
-                               pr_err("'--bitmap none' only"
-                                       " supported for --grow\n");
-                               exit(2);
-                       }
-                       /* FALL THROUGH */
                case O(GROW,'b'):
                case O(GROW,Bitmap):
                        if (strcmp(optarg, "internal")== 0 ||
@@ -1062,7 +1106,8 @@ int main(int argc, char *argv[])
                case O(BUILD,BitmapChunk):
                case O(CREATE,BitmapChunk): /* bitmap chunksize */
                        s.bitmap_chunk = parse_size(optarg);
-                       if (s.bitmap_chunk <= 0 ||
+                       if (s.bitmap_chunk == 0 ||
+                           s.bitmap_chunk == INVALID_SECTORS ||
                            s.bitmap_chunk & (s.bitmap_chunk - 1)) {
                                pr_err("invalid bitmap chunksize: %s\n",
                                       optarg);
@@ -1171,15 +1216,13 @@ int main(int argc, char *argv[])
                        /* non-existent device is OK */
                        mdfd = open_mddev(devlist->devname, 0);
                if (mdfd == -2) {
-                       pr_err("device %s exists but is not an "
-                               "md array.\n", devlist->devname);
+                       pr_err("device %s exists but is not an md array.\n", devlist->devname);
                        exit(1);
                }
                if ((int)ident.super_minor == -2) {
                        struct stat stb;
                        if (mdfd < 0) {
-                               pr_err("--super-minor=dev given, and "
-                                       "listed device %s doesn't exist.\n",
+                               pr_err("--super-minor=dev given, and listed device %s doesn't exist.\n",
                                        devlist->devname);
                                exit(1);
                        }
@@ -1217,6 +1260,11 @@ int main(int argc, char *argv[])
                c.require_homehost = 0;
        }
 
+       if (c.backup_file && data_offset != INVALID_SECTORS) {
+               pr_err("--backup-file and --data-offset are incompatible\n");
+               exit(2);
+       }
+
        if ((mode == MISC && devmode == 'E')
            || (mode == MONITOR && spare_sharing == 0))
                /* Anyone may try this */;
@@ -1243,8 +1291,10 @@ int main(int argc, char *argv[])
                                            c.update, c.force);
                if (!rv && c.readonly < 0)
                        rv = Manage_ro(devlist->devname, mdfd, c.readonly);
-               if (!rv && c.runstop)
-                       rv = Manage_runstop(devlist->devname, mdfd, c.runstop, c.verbose, 0);
+               if (!rv && c.runstop > 0)
+                       rv = Manage_run(devlist->devname, mdfd, &c);
+               if (!rv && c.runstop < 0)
+                       rv = Manage_stop(devlist->devname, mdfd, c.verbose, 0);
                break;
        case ASSEMBLE:
                if (devs_found == 1 && ident.uuid_set == 0 &&
@@ -1341,7 +1391,7 @@ int main(int argc, char *argv[])
                rv = Create(ss, devlist->devname,
                            ident.name, ident.uuid_set ? ident.uuid : NULL,
                            devs_found-1, devlist->next,
-                           &s, &c);
+                           &s, &c, data_offset);
                break;
        case MISC:
                if (devmode == 'E') {
@@ -1372,7 +1422,7 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                } else
-                       rv = misc_list(devlist, &ident, ss, &c);
+                       rv = misc_list(devlist, &ident, dump_directory, ss, &c);
                break;
        case MONITOR:
                if (!devlist && !c.scan) {
@@ -1410,33 +1460,29 @@ int main(int argc, char *argv[])
                        struct mdinfo sra;
                        int err;
                        if (s.raiddisks || s.level != UnSet) {
-                               pr_err("cannot change array size in same operation "
-                                       "as changing raiddisks or level.\n"
+                               pr_err("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);
+                       sysfs_init(&sra, mdfd, NULL);
                        if (array_size == MAX_SIZE)
                                err = sysfs_set_str(&sra, NULL, "array_size", "default");
                        else
                                err = sysfs_set_num(&sra, NULL, "array_size", array_size / 2);
                        if (err < 0) {
                                if (errno == E2BIG)
-                                       pr_err("--array-size setting"
-                                               " is too large.\n");
+                                       pr_err("--array-size setting is too large.\n");
                                else
-                                       pr_err("current kernel does"
-                                               " not support setting --array-size\n");
+                                       pr_err("current kernel does not support setting --array-size\n");
                                rv = 1;
                                break;
                        }
                }
-               if (devs_found > 1 && s.raiddisks == 0) {
+               if (devs_found > 1 && s.raiddisks == 0 && s.level == UnSet) {
                        /* must be '-a'. */
                        if (s.size > 0 || s.chunk || s.layout_str != NULL || s.bitmap_file) {
-                               pr_err("--add cannot be used with "
-                                       "other geometry changes in --grow mode\n");
+                               pr_err("--add cannot be used with other geometry changes in --grow mode\n");
                                rv = 1;
                                break;
                        }
@@ -1449,9 +1495,7 @@ int main(int argc, char *argv[])
                } else if (s.bitmap_file) {
                        if (s.size > 0 || s.raiddisks || s.chunk ||
                            s.layout_str != NULL || devs_found > 1) {
-                               pr_err("--bitmap changes cannot be "
-                                       "used with other geometry changes "
-                                       "in --grow mode\n");
+                               pr_err("--bitmap changes cannot be used with other geometry changes in --grow mode\n");
                                rv = 1;
                                break;
                        }
@@ -1463,9 +1507,11 @@ int main(int argc, char *argv[])
                                                   mdfd, c.backup_file,
                                                   c.verbose);
                else if (s.size > 0 || s.raiddisks || s.layout_str != NULL
-                        || s.chunk != 0 || s.level != UnSet) {
+                        || s.chunk != 0 || s.level != UnSet
+                        || data_offset != INVALID_SECTORS) {
                        rv = Grow_reshape(devlist->devname, mdfd,
-                                         devlist->next, &c, &s);
+                                         devlist->next,
+                                         data_offset, &c, &s);
                } else if (array_size == 0)
                        pr_err("no changes to --grow\n");
                break;
@@ -1474,6 +1520,11 @@ int main(int argc, char *argv[])
                        RebuildMap();
                }
                if (c.scan) {
+                       rv = 1;
+                       if (devlist) {
+                               pr_err("In --incremental mode, a device cannot be given with --scan.\n");
+                               break;
+                       }
                        if (c.runstop <= 0) {
                                pr_err("--incremental --scan meaningless without --run.\n");
                                break;
@@ -1482,7 +1533,7 @@ int main(int argc, char *argv[])
                                pr_err("--incremental --scan --fail not supported.\n");
                                break;
                        }
-                       rv = IncrementalScan(c.verbose);
+                       rv = IncrementalScan(&c, NULL);
                }
                if (!devlist) {
                        if (!rebuild_map && !c.scan) {
@@ -1491,16 +1542,16 @@ int main(int argc, char *argv[])
                        }
                        break;
                }
-               if (devlist->next) {
-                       pr_err("--incremental can only handle one device.\n");
-                       rv = 1;
-                       break;
-               }
-               if (devmode == 'f')
+               if (devmode == 'f') {
+                       if (devlist->next) {
+                               pr_err("'--incremental --fail' can only handle one device.\n");
+                               rv = 1;
+                               break;
+                       }
                        rv = IncrementalRemove(devlist->devname, remove_path,
                                               c.verbose);
-               else
-                       rv = Incremental(devlist->devname, &c, ss);
+               else
+                       rv = Incremental(devlist, &c, ss);
                break;
        case AUTODETECT:
                autodetect();
@@ -1521,8 +1572,7 @@ static int scan_assemble(struct supertype *ss,
        int failures, successes;
 
        if (conf_verify_devnames(array_list)) {
-               pr_err("Duplicate MD device names in "
-                      "conf file were found.\n");
+               pr_err("Duplicate MD device names in conf file were found.\n");
                return 1;
        }
        if (devlist == NULL) {
@@ -1535,9 +1585,7 @@ static int scan_assemble(struct supertype *ss,
                        a->autof = c->autof;
        }
        if (map_lock(&map))
-               pr_err("%s: failed to get "
-                      "exclusive lock on mapfile\n",
-                      __func__);
+               pr_err("failed to get exclusive lock on mapfile\n");
        do {
                failures = 0;
                successes = 0;
@@ -1549,7 +1597,7 @@ static int scan_assemble(struct supertype *ss,
                        if (a->devname &&
                            strcasecmp(a->devname, "<ignore>") == 0)
                                continue;
-                               
+
                        r = Assemble(ss, a->devname,
                                     a, NULL, c);
                        if (r == 0) {
@@ -1609,19 +1657,21 @@ static int misc_scan(char devmode, struct context *c)
 
        for (members = 0; members <= 1; members++) {
                for (e=ms ; e ; e=e->next) {
-                       char *name;
+                       char *name = NULL;
                        struct map_ent *me;
+                       struct stat stb;
                        int member = e->metadata_version &&
                                strncmp(e->metadata_version,
                                        "external:/", 10) == 0;
                        if (members != member)
                                continue;
-                       me = map_by_devnum(&map, e->devnum);
+                       me = map_by_devnm(&map, e->devnm);
                        if (me && me->path
                            && strcmp(me->path, "/unknown") != 0)
                                name = me->path;
-                       else
-                               name = get_md_name(e->devnum);
+                       if (name == NULL ||
+                           stat(name, &stb) != 0)
+                               name = get_md_name(e->devnm);
 
                        if (!name) {
                                pr_err("cannot find device file for %s\n",
@@ -1655,7 +1705,7 @@ static int stop_scan(int verbose)
                if (!progress) last = 1;
                progress = 0; err = 0;
                for (e=ms ; e ; e=e->next) {
-                       char *name = get_md_name(e->devnum);
+                       char *name = get_md_name(e->devnm);
                        int mdfd;
 
                        if (!name) {
@@ -1665,7 +1715,7 @@ static int stop_scan(int verbose)
                        }
                        mdfd = open_mddev(name, 1);
                        if (mdfd >= 0) {
-                               if (Manage_runstop(name, mdfd, -1, verbose, !last))
+                               if (Manage_stop(name, mdfd, verbose, !last))
                                        err = 1;
                                else
                                        progress = 1;
@@ -1683,12 +1733,13 @@ static int stop_scan(int verbose)
 
 static int misc_list(struct mddev_dev *devlist,
                     struct mddev_ident *ident,
+                    char *dump_directory,
                     struct supertype *ss, struct context *c)
 {
        struct mddev_dev *dv;
        int rv = 0;
 
-       for (dv=devlist ; dv; dv=dv->next) {
+       for (dv=devlist ; dv; dv=(rv & 16) ? NULL : dv->next) {
                int mdfd;
 
                switch(dv->disposition) {
@@ -1711,6 +1762,8 @@ static int misc_list(struct mddev_dev *devlist,
                        rv |= Query(dv->devname); continue;
                case 'X':
                        rv |= ExamineBitmap(dv->devname, c->brief, ss); continue;
+               case ExamineBB:
+                       rv |= ExamineBadblocks(dv->devname, c->brief, ss); continue;
                case 'W':
                case WaitOpt:
                        rv |= Wait(dv->devname); continue;
@@ -1728,14 +1781,31 @@ static int misc_list(struct mddev_dev *devlist,
                        rv |= Update_subarray(dv->devname, c->subarray,
                                              c->update, ident, c->verbose);
                        continue;
+               case Dump:
+                       rv |= Dump_metadata(dv->devname, dump_directory, c, ss);
+                       continue;
+               case Restore:
+                       rv |= Restore_metadata(dv->devname, dump_directory, c, ss,
+                                              (dv == devlist && dv->next == NULL));
+                       continue;
+               case Action:
+                       rv |= SetAction(dv->devname, c->action);
+                       continue;
+               }
+               if (dv->devname[0] == '/')
+                       mdfd = open_mddev(dv->devname, 1);
+               else {
+                       mdfd = open_dev(dv->devname);
+                       if (mdfd < 0)
+                               pr_err("Cannot open %s\n", dv->devname);
                }
-               mdfd = open_mddev(dv->devname, 1);
                if (mdfd>=0) {
                        switch(dv->disposition) {
                        case 'R':
-                               rv |= Manage_runstop(dv->devname, mdfd, 1, c->verbose, 0); break;
+                               c->runstop = 1;
+                               rv |= Manage_run(dv->devname, mdfd, c); break;
                        case 'S':
-                               rv |= Manage_runstop(dv->devname, mdfd, -1, c->verbose, 0); break;
+                               rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0); break;
                        case 'o':
                                rv |= Manage_ro(dv->devname, mdfd, 1); break;
                        case 'w':
@@ -1747,3 +1817,26 @@ static int misc_list(struct mddev_dev *devlist,
        }
        return rv;
 }
+
+int SetAction(char *dev, char *action)
+{
+       int fd = open(dev, O_RDONLY);
+       struct mdinfo mdi;
+       if (fd < 0) {
+               pr_err("Couldn't open %s: %s\n", dev, strerror(errno));
+               return 1;
+       }
+       sysfs_init(&mdi, fd, NULL);
+       close(fd);
+       if (!mdi.sys_name[0]) {
+               pr_err("%s is no an md array\n", dev);
+               return 1;
+       }
+
+       if (sysfs_set_str(&mdi, NULL, "sync_action", action) < 0) {
+               pr_err("Count not set action for %s to %s: %s\n",
+                      dev, action, strerror(errno));
+               return 1;
+       }
+       return 0;
+}