]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - mdadm.c
Improve code for recognising config lines.
[thirdparty/mdadm.git] / mdadm.c
diff --git a/mdadm.c b/mdadm.c
index 7b6c3d01039c3d463494fb7f19131cf1596e64f9..902d401fbc9d1b5b0ea2883b3d142a88a4248468 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2002 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
        int level = UnSet;
        int layout = UnSet;
        int raiddisks = 0;
-       int max_disks = MD_SB_DISKS;
+       int max_disks = MD_SB_DISKS; /* just a default */
        int sparedisks = 0;
        struct mddev_ident_s ident;
        char *configfile = NULL;
@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
        int write_behind = 0;
        int bitmap_fd = -1;
        char *bitmap_file = NULL;
+       char *backup_file = NULL;
        int bitmap_chunk = UnSet;
        int SparcAdjust = 0;
        mddev_dev_t devlist = NULL;
@@ -74,14 +75,17 @@ int main(int argc, char *argv[])
        int force = 0;
        int test = 0;
        int assume_clean = 0;
-       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.
-                       */
+       /* autof indicates whether and how to create device node.
+        * bottom 3 bits are style.  Rest (when shifted) are number of parts
+        * 0  - unset
+        * 1  - don't create (no)
+        * 2  - if is_standard, then create (yes)
+        * 3  - create as 'md' - reject is_standard mdp (md)
+        * 4  - create as 'mdp' - reject is_standard md (mdp)
+        * 5  - default to md if not is_standard (md in config file)
+        * 6  - default to mdp if not is_standard (part, or mdp in config file)
+        */
+       int autof = 0;
 
        char *mailaddr = NULL;
        char *program = NULL;
@@ -111,6 +115,7 @@ int main(int argc, char *argv[])
        ident.autof = 0;
        ident.st = NULL;
        ident.bitmap_fd = -1;
+       ident.bitmap_file = NULL;
        ident.name[0] = 0;
 
        while ((option_index = -1) ,
@@ -401,16 +406,18 @@ int main(int argc, char *argv[])
                                break;
 
                        case 10:
-                               /* 'f' or 'n' followed by a number <= raid_disks */
-                               if ((optarg[0] !=  'n' && optarg[0] != 'f') ||
+                               /* 'f', 'o' or 'n' followed by a number <= raid_disks */
+                               if ((optarg[0] !=  'n' && optarg[0] != 'f' && optarg[0] != 'o') ||
                                    (copies = strtoul(optarg+1, &cp, 10)) < 1 ||
                                    copies > 200 ||
                                    *cp) {
-                                       fprintf(stderr, Name ": layout for raid10 must be 'nNN' or 'fNN' where NN is a number, not %s\n", optarg);
+                                       fprintf(stderr, Name ": layout for raid10 must be 'nNN', 'oNN' or 'fNN' where NN is a number, not %s\n", optarg);
                                        exit(2);
                                }
                                if (optarg[0] == 'n')
                                        layout = 256 + copies;
+                               else if (optarg[0] == 'o')
+                                       layout = 0x10000 + (copies<<8) + 1;
                                else
                                        layout = 1 + (copies<<8);
                                break;
@@ -478,39 +485,7 @@ int main(int argc, char *argv[])
                case O(CREATE,'a'):
                case O(BUILD,'a'):
                case O(ASSEMBLE,'a'): /* auto-creation of device node */
-                       if (optarg == NULL)
-                               autof = -2;
-                       else if (strcasecmp(optarg,"no")==0)
-                               autof = 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 */
-                               char *e = optarg + strlen(optarg);
-                               int num = 4;
-                               int len;
-                               while (e > optarg && isdigit(e[-1]))
-                                       e--;
-                               if (*e) {
-                                       num = atoi(e);
-                                       if (num <= 0) num = 1;
-                               }
-                               if (e > optarg && e[-1] == '-')
-                                       e--;
-                               len = e - optarg;
-                               if ((len == 3 && strncasecmp(optarg,"mdp",3)==0) ||
-                                   (len == 1 && strncasecmp(optarg,"p",1)==0) ||
-                                   (len >= 4 && strncasecmp(optarg,"part",4)==0))
-                                       autof = num;
-                               else {
-                                       fprintf(stderr, Name ": --auto flag arg of \"%s\" unrecognised: use no,yes,md,mdp,part\n"
-                                               "        optionally followed by a number.\n",
-                                               optarg);
-                                       exit(2);
-                               }
-                       }
+                       autof = parse_auto(optarg, "--auto flag", 0);
                        continue;
 
                case O(BUILD,'f'): /* force honouring '-n 1' */
@@ -602,6 +577,10 @@ int main(int argc, char *argv[])
                        fprintf(stderr, Name ": '--update %s' invalid.  Only 'sparc2.2', 'super-minor', 'uuid', 'resync' or 'summaries' supported\n",update);
                        exit(2);
 
+               case O(ASSEMBLE,4): /* --no-degraded */
+                       runstop = -1; /* --stop isn't allowed for --assemble, so we overload slightly */
+                       continue;
+
                case O(ASSEMBLE,'c'): /* config file */
                case O(MISC, 'c'):
                case O(MONITOR,'c'):
@@ -769,11 +748,30 @@ int main(int argc, char *argv[])
                        ident.bitmap_fd = bitmap_fd; /* for Assemble */
                        continue;
 
+               case O(ASSEMBLE, 7):
+               case O(GROW, 7):
+                       /* Specify a file into which grow might place a backup,
+                        * or from which assemble might recover a backup
+                        */
+                       if (backup_file) {
+                               fprintf(stderr, Name ": backup file already specified, rejecting %s\n", optarg);
+                               exit(2);
+                       }
+                       backup_file = optarg;
+                       continue;
+
                case O(GROW,'b'):
                case O(BUILD,'b'):
                case O(CREATE,'b'): /* here we create the bitmap */
-                       bitmap_file = optarg;
-                       continue;
+                       if (strcmp(optarg, "internal")== 0 ||
+                           strcmp(optarg, "none")== 0 ||
+                           strchr(optarg, '/') != NULL) {
+                               bitmap_file = optarg;
+                               continue;
+                       }
+                       /* probable typo */
+                       fprintf(stderr, Name ": bitmap file must contain a '/', or be 'internal', or 'none'\n");
+                       exit(2);
 
                case O(GROW,4):
                case O(BUILD,4):
@@ -805,8 +803,13 @@ int main(int argc, char *argv[])
                /* We have now processed all the valid options. Anything else is
                 * an error
                 */
-               fprintf(stderr, Name ": option %c not valid in %s mode\n",
-                       opt, map_num(modes, mode));
+               if (option_index > 0)
+                       fprintf(stderr, Name ":option --%s not valid in %s mode\n",
+                               long_options[option_index].name,
+                               map_num(modes, mode));
+               else
+                       fprintf(stderr, Name ": option -%c not valid in %s mode\n",
+                               opt, map_num(modes, mode));
                exit(2);
 
        }
@@ -920,20 +923,24 @@ int main(int argc, char *argv[])
                                        rv |= 1;
                                else {
                                        rv |= Assemble(ss, devlist->devname, mdfd, array_ident, configfile,
-                                                      NULL,
+                                                      NULL, backup_file,
                                                       readonly, runstop, update, verbose-quiet, force);
                                        close(mdfd);
                                }
                        }
                } else if (!scan)
                        rv = Assemble(ss, devlist->devname, mdfd, &ident, configfile,
-                                     devlist->next,
+                                     devlist->next, backup_file,
                                      readonly, runstop, update, verbose-quiet, force);
                else if (devs_found>0) {
                        if (update && devs_found > 1) {
                                fprintf(stderr, Name ": can only update a single array at a time\n");
                                exit(1);
                        }
+                       if (backup_file && devs_found > 1) {
+                               fprintf(stderr, Name ": can only assemble a single array when providing a backup file.\n");
+                               exit(1);
+                       }
                        for (dv = devlist ; dv ; dv=dv->next) {
                                mddev_ident_t array_ident = conf_get_ident(configfile, dv->devname);
                                if (array_ident == NULL) {
@@ -949,7 +956,7 @@ int main(int argc, char *argv[])
                                        continue;
                                }
                                rv |= Assemble(ss, dv->devname, mdfd, array_ident, configfile,
-                                              NULL,
+                                              NULL, backup_file,
                                               readonly, runstop, update, verbose-quiet, force);
                                close(mdfd);
                        }
@@ -959,6 +966,14 @@ int main(int argc, char *argv[])
                                fprintf(stderr, Name ": No arrays found in config file\n");
                                rv = 1;
                        } else
+                               if (update) {
+                                       fprintf(stderr, Name ": --update not meaningful with a --scan assembly.\n");
+                                       exit(1);
+                               }
+                               if (backup_file) {
+                                       fprintf(stderr, Name ": --backup_file not meaningful with a --scan assembly.\n");
+                                       exit(1);
+                               }
                                for (; array_list; array_list = array_list->next) {
                                        mdu_array_info_t array;
                                        mdfd = open_mddev(array_list->devname, 
@@ -973,14 +988,13 @@ int main(int argc, char *argv[])
                                        else
                                                rv |= Assemble(ss, array_list->devname, mdfd,
                                                               array_list, configfile,
-                                                              NULL,
+                                                              NULL, NULL,
                                                               readonly, runstop, NULL, verbose-quiet, force);
                                        close(mdfd);
                                }
                }
                break;
        case BUILD:
-               if (bitmap_chunk == UnSet) bitmap_chunk = DEFAULT_BITMAP_CHUNK;
                if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
                if (write_behind && !bitmap_file) {
                        fprintf(stderr, Name ": write-behind mode requires a bitmap.\n");
@@ -1087,7 +1101,7 @@ int main(int argc, char *argv[])
                                case 'D':
                                        rv |= Detail(dv->devname, brief?1+verbose:0, test); continue;
                                case 'K': /* Zero superblock */
-                                       rv |= Kill(dv->devname, force); continue;
+                                       rv |= Kill(dv->devname, force, quiet); continue;
                                case 'Q':
                                        rv |= Query(dv->devname); continue;
                                case 'X':
@@ -1148,7 +1162,8 @@ int main(int argc, char *argv[])
                } else if (layout != UnSet)
                        rv = Manage_reconfig(devlist->devname, mdfd, layout);
                else if (size >= 0 || raiddisks)
-                       rv = Manage_resize(devlist->devname, mdfd, size, raiddisks);
+                       rv = Grow_reshape(devlist->devname, mdfd, quiet, backup_file,
+                                         size, level, layout, chunk, raiddisks);
                else if (bitmap_file) {
                        if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
                        rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,