]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Add device files created with --auto to list of known device files.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index e18167375a2c6e720dcc1bbde48fb41a2149a31a..45c59b379d251fcb01a4e67469bdb172dc35fb3c 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -25,6 +25,9 @@
  *           The University of New South Wales
  *           Sydney, 2052
  *           Australia
+ *
+ *    Additions for bitmap and async RAID options, Copyright (C) 2003-2004, 
+ *    Paul Clements, SteelEye Technology, Inc.
  */
 
 #include "mdadm.h"
 #include <ctype.h>
 
 
-void make_parts(char *dev, int cnt)
-{
-       /* make 'cnt' partition devices for 'dev'
-        * We use the major/minor from dev and add 1..cnt
-        * If dev ends with a digit, we add "_p%d" else "%d"
-        * If the name exists, we use it's owner/mode,
-        * else that of dev
-        */
-       struct stat stb;
-       int major, minor;
-       int i;
-       char *name = malloc(strlen(dev) + 20);
-       int dig = isdigit(dev[strlen(dev)-1]);
-
-       if (stat(dev, &stb)!= 0)
-               return;
-       if (!S_ISBLK(stb.st_mode))
-               return;
-       major = MAJOR(stb.st_rdev);
-       minor = MINOR(stb.st_rdev);
-       for (i=1; i <= cnt ; i++) {
-               struct stat stb2;
-               sprintf(name, "%s%s%d", dev, dig?"_p":"", i);
-               if (stat(name, &stb2)==0) {
-                       if (!S_ISBLK(stb2.st_mode))
-                               continue;
-                       if (stb2.st_rdev == MKDEV(major, minor+i))
-                               continue;
-                       unlink(name);
-               } else {
-                       stb2 = stb;
-               }
-               mknod(name, S_IFBLK | 0600, MKDEV(major, minor+i));
-               chown(name, stb2.st_uid, stb2.st_gid);
-               chmod(name, stb2.st_mode & 07777);
-       }
-}
-
-/*
- * Open a given md device, and check that it really is one.
- * If 'autof' is given, then we need to create, or recreate, the md device.
- * If the name already exists, and is not a block device, we fail.
- * If it exists and is not an md device, is not the right type (partitioned or not),
- * or is currently in-use, we remove the device, but remember the owner and mode.
- * If it now doesn't exist, we find a few md array and create the device.
- * Default ownership is user=0, group=0 perm=0600
- */
-int open_mddev(char *dev, int autof)
-{
-       int mdfd;
-       struct stat stb;
-       int major = MD_MAJOR;
-       int minor;
-       int must_remove = 0;
-       struct mdstat_ent *mdlist;
-       int num;
-
-       if (autof) {
-               /* autof is set, so we need to check that the name is ok,
-                * and possibly create one if not
-                */
-               stb.st_mode = 0;
-               if (lstat(dev, &stb)==0 && ! S_ISBLK(stb.st_mode)) {
-                       fprintf(stderr, Name ": %s is not a block device.\n",
-                               dev);
-                       return -1;
-               }
-               /* check major number is correct */
-               if (autof>0)
-                       major = get_mdp_major();
-               if (stb.st_mode && MAJOR(stb.st_rdev) != major)
-                       must_remove = 1;
-               if (stb.st_mode && !must_remove) {
-                       mdu_array_info_t array;
-                       /* looks ok, see if it is available */
-                       mdfd = open(dev, O_RDWR, 0);
-                       if (mdfd < 0) {
-                               fprintf(stderr, Name ": error opening %s: %s\n",
-                                       dev, strerror(errno));
-                               return -1;
-                       } else if (md_get_version(mdfd) <= 0) {
-                               fprintf(stderr, Name ": %s does not appear to be an md device\n",
-                                       dev);
-                               close(mdfd);
-                               return -1;
-                       }
-                       if (ioctl(mdfd, GET_ARRAY_INFO, &array)==0) {
-                               /* already active */
-                               must_remove = 1;
-                               close(mdfd);
-                       } else {
-                               if (autof > 0)
-                                       make_parts(dev, autof);
-                               return mdfd;
-                       }
-               }
-               /* Ok, need to find a minor that is not in use.
-                * Easiest to read /proc/mdstat, and hunt through for
-                * an unused number 
-                */
-               mdlist = mdstat_read(0);
-               for (num= (autof>0)?-1:0 ; ; num+= (autof>2)?-1:1) {
-                       struct mdstat_ent *me;
-                       for (me=mdlist; me; me=me->next)
-                               if (me->devnum == num)
-                                       break;
-                       if (!me) {
-                               /* doesn't exist if mdstat.
-                                * make sure it is new to /dev too
-                                */
-                               char *dn;
-                               if (autof > 0) 
-                                       minor = (-1-num) << MdpMinorShift;
-                               else
-                                       minor = num;
-                               dn = map_dev(major,minor);
-                               if (dn==NULL || is_standard(dn)) {
-                                       /* this number only used by a 'standard' name,
-                                        * so it is safe to use
-                                        */
-                                       break;
-                               }
-                       }
-               }
-               /* 'num' is the number to use, >=0 for md, <0 for mdp */
-               if (must_remove) {
-                       /* never remove a device name that ends /mdNN or /dNN,
-                        * that would be confusing 
-                        */
-                       if (is_standard(dev)) {
-                               fprintf(stderr, Name ": --auto refusing to remove %s as it looks like a standard name.\n",
-                                       dev);
-                               return -1;
-                       }
-                       unlink(dev);
-               }
-
-               if (mknod(dev, S_IFBLK|0600, MKDEV(major, minor))!= 0) {
-                       fprintf(stderr, Name ": failed to create %s\n", dev);
-                       return -1;
-               }
-               if (must_remove) {
-                       chown(dev, stb.st_uid, stb.st_gid);
-                       chmod(dev, stb.st_mode & 07777);
-               }
-               make_parts(dev,autof);
-       }
-       mdfd = open(dev, O_RDWR, 0);
-       if (mdfd < 0)
-               fprintf(stderr, Name ": error opening %s: %s\n",
-                       dev, strerror(errno));
-       else if (md_get_version(mdfd) <= 0) {
-               fprintf(stderr, Name ": %s does not appear to be an md device\n",
-                       dev);
-               close(mdfd);
-               mdfd = -1;
-       }
-       return mdfd;
-}
-
-
-
 int main(int argc, char *argv[])
 {
        int mode = 0;
@@ -202,12 +43,14 @@ int main(int argc, char *argv[])
        char *help_text;
        char *c;
        int rv;
+       int i;
 
        int chunk = 0;
        int size = -1;
        int level = UnSet;
        int layout = UnSet;
        int raiddisks = 0;
+       int max_disks = MD_SB_DISKS;
        int sparedisks = 0;
        struct mddev_ident_s ident;
        char *configfile = NULL;
@@ -217,6 +60,9 @@ int main(int argc, char *argv[])
        char devmode = 0;
        int runstop = 0;
        int readonly = 0;
+       int bitmap_fd = -1;
+       char *bitmap_file = NULL;
+       int bitmap_chunk = UnSet;
        int SparcAdjust = 0;
        mddev_dev_t devlist = NULL;
        mddev_dev_t *devlistend = & devlist;
@@ -227,23 +73,38 @@ int main(int argc, char *argv[])
        int force = 0;
        int test = 0;
        int assume_clean = 0;
-       int autof = 0; /* -1 for non-partitions, 1 or more to create partitions */
+       int autof = 0; /* -2 means create device based on name:
+                       *    if it ends mdN, then non-partitioned array N
+                       *    if it ends dN, then partitions array N
+                       * -1 means create non-partitioned, choose N
+                       *  1 or more to create partitioned
+                       * If -1 or 1 and name is a 'standard' name, then
+                       * insist on a match of type and number.
+                       */
 
        char *mailaddr = NULL;
        char *program = NULL;
        int delay = 0;
        int daemonise = 0;
+       char *pidfile = NULL;
        int oneshot = 0;
+       struct supertype *ss = NULL;
 
        int copies;
 
        int mdfd = -1;
 
+       srandom(time(0) ^ getpid());
+
        ident.uuid_set=0;
        ident.level = UnSet;
        ident.raid_disks = UnSet;
        ident.super_minor= UnSet;
        ident.devices=0;
+       ident.spare_group = NULL;
+       ident.autof = 0;
+       ident.st = NULL;
+       ident.bitmap_fd = -1;
 
        while ((option_index = -1) ,
               (opt=getopt_long(argc, argv,
@@ -274,10 +135,13 @@ int main(int argc, char *argv[])
                        fputs(Version, stderr);
                        exit(0);
 
-               case 'v': verbose = 1;
+               case 'v': verbose++;
                        continue;
 
-               case 'b': brief = 1;
+               case 'b':
+                       if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW)
+                               break; /* b means bitmap */
+                       brief = 1;
                        continue;
 
                case ':':
@@ -296,7 +160,8 @@ int main(int argc, char *argv[])
                case 'a':
                case 'r':
                case 'f':
-               case 1 : if (!mode) newmode = MANAGE; break;
+                       if (!mode) newmode = MANAGE; 
+                       break;
 
                case 'A': newmode = ASSEMBLE; break;
                case 'B': newmode = BUILD; break;
@@ -307,6 +172,7 @@ int main(int argc, char *argv[])
                case '#':
                case 'D':
                case 'E':
+               case 'X':
                case 'Q': newmode = MISC; break;
                case 'R':
                case 'S':
@@ -323,7 +189,7 @@ int main(int argc, char *argv[])
                                fprintf(stderr, "--%s", long_options[option_index].name);
                        else
                                fprintf(stderr, "-%c", opt);
-                       fprintf(stderr, " would set mode to %s, but it is already %s.\n",
+                       fprintf(stderr, " would set mdadm mode to \"%s\", but it is already set to \"%s\".\n",
                                map_num(modes, newmode),
                                map_num(modes, mode));
                        exit(2);
@@ -337,11 +203,33 @@ int main(int argc, char *argv[])
                                fputs(Help_config, stderr);
                                exit(0);
                        }
+
+                       /* If first option is a device, don't force the mode yet */
+                       if (opt == 1) {
+                               if (devs_found == 0) {
+                                       dv = malloc(sizeof(*dv));
+                                       if (dv == NULL) {
+                                               fprintf(stderr, Name ": malloc failed\n");
+                                               exit(3);
+                                       }
+                                       dv->devname = optarg;
+                                       dv->disposition = devmode;
+                                       dv->next = NULL;
+                                       *devlistend = dv;
+                                       devlistend = &dv->next;
+                       
+                                       devs_found++;
+                                       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");
+                               exit(2);
+                       }
                        if (option_index >= 0)
-                               fprintf(stderr, "--%s", long_options[option_index].name);
+                               fprintf(stderr, Name ": --%s", long_options[option_index].name);
                        else
-                               fprintf(stderr, "-%c", opt);
-                       fprintf(stderr, " does not set the mode, and so cannot be first.\n");
+                               fprintf(stderr, Name ": -%c", opt);
+                       fprintf(stderr, " does not set the mode, and so cannot be the first option.\n");
                        exit(2);
                }
 
@@ -401,6 +289,23 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case O(CREATE,'e'):
+               case O(ASSEMBLE,'e'):
+               case O(MISC,'e'): /* set metadata (superblock) information */
+                       if (ss) {
+                               fprintf(stderr, Name ": metadata information already given\n");
+                               exit(2);
+                       }
+                       for(i=0; !ss && superlist[i]; i++) 
+                               ss = superlist[i]->match_metadata_desc(optarg);
+
+                       if (!ss) {
+                               fprintf(stderr, Name ": unrecognised metadata identifier: %s\n", optarg);
+                               exit(2);
+                       }
+                       max_disks = ss->max_devs;
+                       continue;
+
                case O(GROW,'z'):
                case O(CREATE,'z'): /* size */
                        if (size >= 0) {
@@ -420,6 +325,7 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case O(GROW,'l'): /* hack - needed to understand layout */
                case O(CREATE,'l'):
                case O(BUILD,'l'): /* set raid level*/
                        if (level != UnSet) {
@@ -433,7 +339,7 @@ int main(int argc, char *argv[])
                                        optarg);
                                exit(2);
                        }
-                       if (level != 0 && level != -1 && level != 1 && level != -4 && mode == BUILD) {
+                       if (level != 0 && level != -1 && level != 1 && level != -4 && level != -5 && mode == BUILD) {
                                fprintf(stderr, Name ": Raid level %s not permitted with --build.\n",
                                        optarg);
                                exit(2);
@@ -447,6 +353,8 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(CREATE,'p'): /* raid5 layout */
+               case O(BUILD,'p'): /* faulty layout */
+               case O(GROW, 'p'): /* faulty reconfig */
                        if (layout != UnSet) {
                                fprintf(stderr,Name ": layout may only be sent once.  "
                                        "Second value was %s\n", optarg);
@@ -485,6 +393,23 @@ int main(int argc, char *argv[])
                                else
                                        layout = 1 + (copies<<8);
                                break;
+                       case -5: /* Faulty
+                                 * modeNNN
+                                 */
+                                   
+                       {
+                               int ln = strcspn(optarg, "0123456789");
+                               char *m = strdup(optarg);
+                               int mode;
+                               m[ln] = 0;
+                               mode = map_name(faultylayout, m);
+                               if (mode == UnSet) {
+                                       fprintf(stderr, Name ": layout %s not understood for faulty.\n",
+                                               optarg);
+                                       exit(2);
+                               }
+                               layout = mode | (atoi(optarg+ln)<< ModeShift);
+                       }
                        }
                        continue;
 
@@ -502,17 +427,11 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        raiddisks = strtol(optarg, &c, 10);
-                       if (!optarg[0] || *c || raiddisks<=0 || raiddisks > MD_SB_DISKS) {
+                       if (!optarg[0] || *c || raiddisks<=0) {
                                fprintf(stderr, Name ": invalid number of raid devices: %s\n",
                                        optarg);
                                exit(2);
                        }
-                       if (raiddisks == 1 &&  !force) {
-                               fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
-                                       "     a mistake.  If you really mean it you will need to specify --force before\n"
-                                       "     setting the number of drives.\n");
-                               exit(2);
-                       }
                        ident.raid_disks = raiddisks;
                        continue;
 
@@ -528,7 +447,7 @@ int main(int argc, char *argv[])
                                exit(2);
                        }
                        sparedisks = strtol(optarg, &c, 10);
-                       if (!optarg[0] || *c || sparedisks < 0 || sparedisks > MD_SB_DISKS - raiddisks) {
+                       if (!optarg[0] || *c || sparedisks < 0) {
                                fprintf(stderr, Name ": invalid number of spare-devices: %s\n",
                                        optarg);
                                exit(2);
@@ -539,10 +458,12 @@ int main(int argc, char *argv[])
                case O(BUILD,'a'):
                case O(ASSEMBLE,'a'): /* auto-creation of device node */
                        if (optarg == NULL)
-                               autof = -1;
+                               autof = -2;
                        else if (strcasecmp(optarg,"no")==0)
                                autof = 0;
-                       else if (strcasecmp(optarg,"yes")==0 || strcasecmp(optarg,"md")==0)
+                       else if (strcasecmp(optarg,"yes")==0)
+                               autof = -2;
+                       else if (strcasecmp(optarg,"md")==0)
                                autof = -1;
                        else {
                                /* There might be digits, and maybe a hypen, at the end */
@@ -572,6 +493,7 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(BUILD,'f'): /* force honouring '-n 1' */
+               case O(GROW,'f'): /* ditto */
                case O(CREATE,'f'): /* force honouring of device list */
                case O(ASSEMBLE,'f'): /* force assembly */
                case O(MISC,'f'): /* force zero */
@@ -662,6 +584,9 @@ int main(int argc, char *argv[])
                        continue;
 
                case O(MONITOR,'d'): /* delay in seconds */
+               case O(GROW, 'd'):
+               case O(BUILD,'d'): /* delay for bitmap updates */
+               case O(CREATE,'d'):
                        if (delay)
                                fprintf(stderr, Name ": only specify delay once. %s ignored.\n",
                                        optarg);
@@ -677,6 +602,13 @@ int main(int argc, char *argv[])
                case O(MONITOR,'f'): /* daemonise */
                        daemonise = 1;
                        continue;
+               case O(MONITOR,'i'): /* pid */
+                       if (pidfile)
+                               fprintf(stderr, Name ": only specify one pid file. %s ignored.\n",
+                                       optarg);
+                       else
+                               pidfile = optarg;
+                       continue;
                case O(MONITOR,'1'): /* oneshot */
                        oneshot = 1;
                        continue;
@@ -736,6 +668,7 @@ int main(int argc, char *argv[])
                case O(MISC,'K'):
                case O(MISC,'R'):
                case O(MISC,'S'):
+               case O(MISC,'X'):
                case O(MISC,'o'):
                case O(MISC,'w'):
                        if (devmode && devmode != opt &&
@@ -757,6 +690,43 @@ int main(int argc, char *argv[])
                        }
                        SparcAdjust = 1;
                        continue;
+
+               case O(ASSEMBLE,'b'): /* here we simply set the bitmap file */
+                       if (!optarg) {
+                               fprintf(stderr, Name ": bitmap file needed with -b in --assemble mode\n");
+                               exit(2);
+                       }
+                       if (strcmp(optarg, "internal")==0) {
+                               fprintf(stderr, Name ": there is no need to specify --bitmap when assembling arrays with internal bitmaps\n");
+                               continue;
+                       }
+                       bitmap_fd = open(optarg, O_RDWR);
+                       if (!*optarg || bitmap_fd < 0) {
+                               fprintf(stderr, Name ": cannot open bitmap file %s: %s\n", optarg, strerror(errno));
+                               exit(2);
+                       }
+                       ident.bitmap_fd = bitmap_fd; /* for Assemble */
+                       continue;
+
+               case O(GROW,'b'):
+               case O(BUILD,'b'):
+               case O(CREATE,'b'): /* here we create the bitmap */
+                       bitmap_file = optarg;
+                       continue;
+
+               case O(GROW,4):
+               case O(BUILD,4):
+               case O(CREATE,4): /* bitmap chunksize */
+                       bitmap_chunk = strtol(optarg, &c, 10);
+                       if (!optarg[0] || *c || bitmap_chunk < 0 ||
+                                       bitmap_chunk & (bitmap_chunk - 1)) {
+                               fprintf(stderr, Name ": invalid bitmap chunksize: %s\n",
+                                               optarg);
+                               exit(2);
+                       }
+                       /* convert K to B, chunk of 0K means 512B */
+                       bitmap_chunk = bitmap_chunk ? bitmap_chunk * 1024 : 512;
+                       continue;
                }
                /* We have now processed all the valid options. Anything else is
                 * an error
@@ -767,6 +737,12 @@ int main(int argc, char *argv[])
 
        }
 
+       if (!mode && devs_found) {
+               mode = MISC;
+               devmode = 'Q';
+               if (devlist->disposition == 0)
+                       devlist->disposition = devmode;
+       }
        if (!mode) {
                fputs(Usage, stderr);
                exit(2);
@@ -797,7 +773,28 @@ int main(int argc, char *argv[])
                if ((int)ident.super_minor == -2) {
                        struct stat stb;
                        fstat(mdfd, &stb);
-                       ident.super_minor = MINOR(stb.st_rdev);
+                       ident.super_minor = minor(stb.st_rdev);
+               }
+       }
+
+       if (raiddisks) {
+               if (raiddisks > max_disks) {
+                       fprintf(stderr, Name ": invalid number of raid devices: %d\n",
+                               raiddisks);
+                       exit(2);
+               }
+               if (raiddisks == 1 &&  !force && level != -5) {
+                       fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
+                               "     a mistake.  If you really mean it you will need to specify --force before\n"
+                               "     setting the number of drives.\n");
+                       exit(2);
+               }
+       }
+       if (sparedisks) {
+               if ( sparedisks > max_disks - raiddisks) {
+                       fprintf(stderr, Name ": invalid number of spare-devices: %d\n",
+                               sparedisks);
+                       exit(2);
                }
        }
 
@@ -813,29 +810,31 @@ int main(int argc, char *argv[])
                if (!rv && readonly < 0)
                        rv = Manage_ro(devlist->devname, mdfd, readonly);
                if (!rv && runstop)
-                       rv = Manage_runstop(devlist->devname, mdfd, runstop);
+                       rv = Manage_runstop(devlist->devname, mdfd, runstop, 0);
                break;
        case ASSEMBLE:
                if (devs_found == 1 && ident.uuid_set == 0 &&
                    ident.super_minor == UnSet && !scan ) {
                        /* Only a device has been given, so get details from config file */
                        mddev_ident_t array_ident = conf_get_ident(configfile, devlist->devname);
-                       mdfd = open_mddev(devlist->devname, array_ident->autof);
-                       if (mdfd < 0)
+                       if (array_ident == NULL) {
+                               fprintf(stderr, Name ": %s not identified in config file.\n",
+                                       devlist->devname);
                                rv |= 1;
-                       else {
-                               if (array_ident == NULL) {
-                                       fprintf(stderr, Name ": %s not identified in config file.\n",
-                                               devlist->devname);
+                       else {
+                               mdfd = open_mddev(devlist->devname, 
+                                                 array_ident->autof ? array_ident->autof : autof);
+                               if (mdfd < 0)
                                        rv |= 1;
-                               }
-                               else 
-                                       rv |= Assemble(devlist->devname, mdfd, array_ident, configfile,
+                               else {
+                                       rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
                                                       NULL,
                                                       readonly, runstop, update, verbose, force);
+                                       close(mdfd);
+                               }
                        }
                } else if (!scan)
-                       rv = Assemble(devlist->devname, mdfd, &ident, configfile,
+                       rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile,
                                      devlist->next,
                                      readonly, runstop, update, verbose, force);
                else if (devs_found>0) {
@@ -845,20 +844,22 @@ int main(int argc, char *argv[])
                        }
                        for (dv = devlist ; dv ; dv=dv->next) {
                                mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname);
-                               mdfd = open_mddev(dv->devname, array_ident->autof);
-                               if (mdfd < 0) {
-                                       rv |= 1;
-                                       continue;
-                               }
                                if (array_ident == NULL) {
                                        fprintf(stderr, Name ": %s not identified in config file.\n",
                                                dv->devname);
                                        rv |= 1;
                                        continue;
                                }
-                               rv |= Assemble(dv->devname, mdfd, array_ident, configfile,
+                               mdfd = open_mddev(dv->devname, 
+                                                 array_ident->autof ?array_ident->autof : autof);
+                               if (mdfd < 0) {
+                                       rv |= 1;
+                                       continue;
+                               }
+                               rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
                                               NULL,
                                               readonly, runstop, update, verbose, force);
+                               close(mdfd);
                        }
                } else {
                        mddev_ident_t array_list =  conf_get_ident(configfile, NULL);
@@ -868,28 +869,63 @@ int main(int argc, char *argv[])
                        } else
                                for (; array_list; array_list = array_list->next) {
                                        mdu_array_info_t array;
-                                       mdfd = open_mddev(array_list->devname, array_list->autof);
+                                       mdfd = open_mddev(array_list->devname, 
+                                                         array_list->autof ? array_list->autof : autof);
                                        if (mdfd < 0) {
                                                rv |= 1;
                                                continue;
                                        }
                                        if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
                                                /* already assembled, skip */
-                                               continue;
-                                       rv |= Assemble(array_list->devname, mdfd,
-                                                      array_list, configfile,
-                                                      NULL,
-                                                      readonly, runstop, NULL, verbose, force);
+                                               ;
+                                       else
+                                               rv |= Assemble(ss, array_list->devname, mdfd,
+                                                              array_list, configfile,
+                                                              NULL,
+                                                              readonly, runstop, NULL, verbose, force);
+                                       close(mdfd);
                                }
                }
                break;
        case BUILD:
-               rv = Build(devlist->devname, mdfd, chunk, level, raiddisks, devlist->next, assume_clean);
+               if (bitmap_chunk == UnSet) bitmap_chunk = DEFAULT_BITMAP_CHUNK;
+               if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+               if (bitmap_file) {
+                       if (strcmp(bitmap_file, "internal")==0) {
+                               fprintf(stderr, Name ": 'internal' bitmaps not supported with --build\n");
+                               rv |= 1;
+                               break;
+                       }
+                       bitmap_fd = open(bitmap_file, O_RDWR,0);
+                       if (bitmap_fd < 0 && errno != ENOENT) {
+                               perror(Name ": cannot create bitmap file");
+                               rv |= 1;
+                               break;
+                       }
+                       if (bitmap_fd < 0) {
+                               bitmap_fd = CreateBitmap(bitmap_file, force, NULL,
+                                                        bitmap_chunk, delay, size);
+                       }
+               }
+               rv = Build(devlist->devname, mdfd, chunk, level, layout,
+                          raiddisks, devlist->next, assume_clean,
+                          bitmap_file, bitmap_chunk, delay);
                break;
        case CREATE:
-               rv = Create(devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
+               if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+               if (ss == NULL) {
+                       for(i=0; !ss && superlist[i]; i++) 
+                               ss = superlist[i]->match_metadata_desc("default");
+               }
+               if (!ss) {
+                       fprintf(stderr, Name ": internal error - no default metadata style\n");
+                       exit(2);
+               }
+
+               rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size,
                            raiddisks, sparedisks,
-                           devs_found-1, devlist->next, runstop, verbose, force);
+                           devs_found-1, devlist->next, runstop, verbose, force,
+                           bitmap_file, bitmap_chunk, delay);
                break;
        case MISC:
 
@@ -904,11 +940,11 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
                                exit(1);
                        }
-                       rv = Examine(devlist, scan?!verbose:brief, scan, SparcAdjust);
+                       rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss);
                } else {
                        if (devlist == NULL) {
-                               if ((devmode == 'S' ||devmode=='D') && scan) {
-                                       /* apply to all devices in /proc/mdstat */
+                               if (devmode=='D' && scan) {
+                                       /* apply --detail to all devices in /proc/mdstat */
                                        struct mdstat_ent *ms = mdstat_read(0);
                                        struct mdstat_ent *e;
                                        for (e=ms ; e ; e=e->next) {
@@ -919,16 +955,43 @@ int main(int argc, char *argv[])
                                                                e->dev);
                                                        continue;
                                                }
-                                               if (devmode == 'D')
-                                                       rv |= Detail(name, !verbose, test);
-                                               else if (devmode=='S') {
-                                                       mdfd = open_mddev(name, 0);
-                                                       if (mdfd >= 0)
-                                                               rv |= Manage_runstop(name, mdfd, -1);
-                                               }
+                                               rv |= Detail(name, verbose>1?0:verbose+1, test);
                                                put_md_name(name);
                                        }
-                               } else {                                                
+                               } else  if (devmode == 'S' && scan) {
+                                       /* apply --stop to all devices in /proc/mdstat */
+                                       /* Due to possible stacking of devices, repeat until
+                                        * nothing more can be stopped
+                                        */
+                                       int progress=1, err;
+                                       int last = 0;
+                                       do {
+                                               struct mdstat_ent *ms = mdstat_read(0);
+                                               struct mdstat_ent *e;
+
+                                               if (!progress) last = 1;
+                                               progress = 0; err = 0;
+                                               for (e=ms ; e ; e=e->next) {
+                                                       char *name = get_md_name(e->devnum);
+
+                                                       if (!name) {
+                                                               fprintf(stderr, Name ": cannot find device file for %s\n",
+                                                                       e->dev);
+                                                               continue;
+                                                       }
+                                                       mdfd = open_mddev(name, 0);
+                                                       if (mdfd >= 0) {
+                                                               if (Manage_runstop(name, mdfd, -1, !last))
+                                                                       err = 1;
+                                                               else
+                                                                       progress = 1;
+                                                               close(mdfd);
+                                                       }
+
+                                                       put_md_name(name);
+                                               }
+                                       } while (!last && err);
+                               } else {
                                        fprintf(stderr, Name ": No devices given.\n");
                                        exit(2);
                                }
@@ -936,24 +999,28 @@ int main(int argc, char *argv[])
                        for (dv=devlist ; dv; dv=dv->next) {
                                switch(dv->disposition) {
                                case 'D':
-                                       rv |= Detail(dv->devname, brief, test); continue;
+                                       rv |= Detail(dv->devname, brief?1+verbose:0, test); continue;
                                case 'K': /* Zero superblock */
                                        rv |= Kill(dv->devname, force); continue;
                                case 'Q':
                                        rv |= Query(dv->devname); continue;
+                               case 'X':
+                                       rv |= ExamineBitmap(dv->devname, brief, ss); continue;
                                }
                                mdfd = open_mddev(dv->devname, 0);
-                               if (mdfd>=0)
+                               if (mdfd>=0) {
                                        switch(dv->disposition) {
                                        case 'R':
-                                               rv |= Manage_runstop(dv->devname, mdfd, 1); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break;
                                        case 'S':
-                                               rv |= Manage_runstop(dv->devname, mdfd, -1); break;
+                                               rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break;
                                        case 'o':
                                                rv |= Manage_ro(dv->devname, mdfd, 1); break;
                                        case 'w':
                                                rv |= Manage_ro(dv->devname, mdfd, -1); break;
                                        }
+                                       close(mdfd);
+                               }
                        }
                }
                break;
@@ -963,8 +1030,13 @@ int main(int argc, char *argv[])
                        rv = 1;
                        break;
                }
+               if (pidfile && !daemonise) {
+                       fprintf(stderr, Name ": Cannot write a pid file when not in daemon mode\n");
+                       rv = 1;
+                       break;
+               }
                rv= Monitor(devlist, mailaddr, program,
-                           delay?delay:60, daemonise, scan, oneshot, configfile, test);
+                           delay?delay:60, daemonise, scan, oneshot, configfile, test, pidfile);
                break;
 
        case GROW:
@@ -981,12 +1053,20 @@ int main(int argc, char *argv[])
                                if (rv)
                                        break;
                        }
-               } else if (size >= 0 && raiddisks) {
-                       fprintf(stderr, Name ": can only grow size OR raiddisks, not both\n");
+               } else if ((size >= 0) + (raiddisks != 0) +  (layout != UnSet) + (bitmap_file != NULL)> 1) {
+                       fprintf(stderr, Name ": can change at most one of size, raiddisks, bitmap, and layout\n");
                        rv = 1;
                        break;
-               } else 
+               } else if (layout != UnSet)
+                       rv = Manage_reconfig(devlist->devname, mdfd, layout);
+               else if (size >= 0 || raiddisks)
                        rv = Manage_resize(devlist->devname, mdfd, size, raiddisks);
+               else if (bitmap_file) {
+                       if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+                       rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
+                                           bitmap_chunk, delay);
+               } else
+                       fprintf(stderr, Name ": no changes to --grow\n");
                break;
        }
        exit(rv);