main: factor out code to parse layout for raid10 and faulty.

[thirdparty/mdadm.git] / mdadm.c

diff --git a/mdadm.c b/mdadm.c
index 99a177186bb60fd336ea2a4a10801eafce2fa7fd..82e2d4383014ad13b1ae8a375409d731926ceb6f 100644 (file)
--- a/mdadm.c
+++ b/mdadm.c
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 
        int chunk = 0;
        long long size = -1;
+       long long array_size = -1;
        int level = UnSet;
        int layout = UnSet;
        int raiddisks = 0;
@@ -106,7 +107,6 @@ int main(int argc, char *argv[])
        int rebuild_map = 0;
        int auto_update_home = 0;
 
-       int copies;
        int print_help = 0;
        FILE *outf;
 
@@ -397,6 +397,24 @@ int main(int argc, char *argv[])
                        }
                        continue;
 
+               case O(GROW,'Z'): /* array size */
+                       if (array_size >= 0) {
+                               fprintf(stderr, Name ": array-size may only be specified once. "
+                                       "Second value is %s.\n", optarg);
+                               exit(2);
+                       }
+                       if (strcmp(optarg, "max") == 0)
+                               array_size = 0;
+                       else {
+                               array_size = parse_size(optarg);
+                               if (array_size <= 0) {
+                                       fprintf(stderr, Name ": invalid array size: %s\n",
+                                               optarg);
+                                       exit(2);
+                               }
+                       }
+                       continue;
+
                case O(GROW,'l'): /* hack - needed to understand layout */
                case O(CREATE,'l'):
                case O(BUILD,'l'): /* set raid level*/
@@ -459,38 +477,22 @@ int main(int argc, char *argv[])
                                break;
 
                        case 10:
-                               /* '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) {
+                               layout = parse_layout_10(optarg);
+                               if (layout < 0) {
                                        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;
                        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) {
+                               layout = parse_layout_faulty(optarg);
+                               if (layout == -1) {
                                        fprintf(stderr, Name ": layout %s not understood for faulty.\n",
                                                optarg);
                                        exit(2);
                                }
-                               layout = mode | (atoi(optarg+ln)<< ModeShift);
-                       }
+                               break;
                        }
                        continue;
 
@@ -1372,6 +1374,28 @@ int main(int argc, char *argv[])
                break;
 
        case GROW:
+               if (array_size >= 0) {
+                       /* alway impose array size first, independent of
+                        * anything else
+                        */
+                       struct mdinfo sra;
+                       int err;
+                       sysfs_init(&sra, mdfd, 0);
+                       if (array_size == 0)
+                               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)
+                                       fprintf(stderr, Name ": --array-size setting"
+                                               " is too large.\n");
+                               else
+                                       fprintf(stderr, Name ": current kernel does"
+                                               " not support setting --array-size\n");
+                               rv = 1;
+                               break;
+                       }
+               }
                if (devs_found > 1) {
 
                        /* must be '-a'. */
@@ -1398,7 +1422,7 @@ int main(int argc, char *argv[])
                        if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
                        rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
                                            bitmap_chunk, delay, write_behind, force);
-               } else
+               } else if (array_size < 0)
                        fprintf(stderr, Name ": no changes to --grow\n");
                break;
        case INCREMENTAL: