RAID-6 check standalone fix component list parsing

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index 7c6979ac2047ad68e55035585aef7c3e8f937143..9ee09280e4c29aa74427680b43b89c786a55dadc 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -114,6 +114,7 @@ int Create(struct supertype *st, char *mddev,
        struct mdinfo info, *infos;
        int did_default = 0;
        int do_default_layout = 0;
+       int do_default_chunk = 0;
        unsigned long safe_mode_delay = 0;
        char chosen_name[1024];
        struct map_ent *map = NULL;
@@ -229,12 +230,10 @@ int Create(struct supertype *st, char *mddev,
        case 10:
        case 6:
        case 0:
-               if (chunk == 0) {
-                       if (st && st->ss->default_geometry)
-                               st->ss->default_geometry(st, NULL, NULL, &chunk);
-                       chunk = chunk ? : 512;
-                       if (verbose > 0)
-                               fprintf(stderr, Name ": chunk size defaults to %dK\n", chunk);
+               if (chunk == 0 || chunk == UnSet) {
+                       chunk = UnSet;
+                       do_default_chunk = 1;
+                       /* chunk will be set later */
                }
                break;
        case LEVEL_LINEAR:
@@ -260,12 +259,25 @@ int Create(struct supertype *st, char *mddev,
                return 1;
        }
        
-       if (size && chunk)
+       if (size && chunk && chunk != UnSet)
                size &= ~(unsigned long long)(chunk - 1);
        newsize = size * 2;
        if (st && ! st->ss->validate_geometry(st, level, layout, raiddisks,
-                                             chunk, size*2, NULL, &newsize, verbose>=0))
+                                             &chunk, size*2, NULL, &newsize, verbose>=0))
                return 1;
+
+       if (chunk && chunk != UnSet) {
+               newsize &= ~(unsigned long long)(chunk*2 - 1);
+               if (do_default_chunk) {
+                       /* default chunk was just set */
+                       if (verbose > 0)
+                               fprintf(stderr, Name ": chunk size "
+                                       "defaults to %dK\n", chunk);
+                       size &= ~(unsigned long long)(chunk - 1);
+                       do_default_chunk = 0;
+               }
+       }
+
        if (size == 0) {
                size = newsize / 2;
                if (size && verbose > 0)
@@ -308,9 +320,12 @@ int Create(struct supertype *st, char *mddev,
                                        layout = default_layout(st, level, verbose);
                                if (st && !st->ss->validate_geometry
                                                (st, level, layout, raiddisks,
-                                                chunk, size*2, dname, &freesize,
-                                                verbose > 0))
+                                                &chunk, size*2, dname, &freesize,
+                                                verbose > 0)) {
+                                       free(st);
                                        st = NULL;
+                                       chunk = do_default_chunk ? UnSet : chunk;
+                               }
                        }
 
                        if (!st) {
@@ -327,7 +342,7 @@ int Create(struct supertype *st, char *mddev,
                                layout = default_layout(st, level, verbose);
                        if (!st->ss->validate_geometry(st, level, layout,
                                                       raiddisks,
-                                                      chunk, size*2, dname,
+                                                      &chunk, size*2, dname,
                                                       &freesize,
                                                       verbose >= 0)) {
 
@@ -341,9 +356,17 @@ int Create(struct supertype *st, char *mddev,
                }
 
                freesize /= 2; /* convert to K */
-               if (chunk) {
+               if (chunk && chunk != UnSet) {
                        /* round to chunk size */
                        freesize = freesize & ~(chunk-1);
+                       if (do_default_chunk) {
+                               /* default chunk was just set */
+                               if (verbose > 0)
+                                       fprintf(stderr, Name ": chunk size "
+                                               "defaults to %dK\n", chunk);
+                               size &= ~(unsigned long long)(chunk - 1);
+                               do_default_chunk = 0;
+                       }
                }
 
                if (size && freesize < size) {
@@ -375,13 +398,14 @@ int Create(struct supertype *st, char *mddev,
                        if (strcmp(st->ss->name, "1.x") == 0 &&
                            st->minor_version >= 1)
                                /* metadata at front */
-                               warn |= check_partitions(fd, dname, 0);
-                       else if (level == 1 || level == LEVEL_CONTAINER)
+                               warn |= check_partitions(fd, dname, 0, 0);
+                       else if (level == 1 || level == LEVEL_CONTAINER
+                                   || (level == 0 && raiddisks == 1))
                                /* partitions could be meaningful */
-                               warn |= check_partitions(fd, dname, freesize*2);
+                               warn |= check_partitions(fd, dname, freesize*2, size*2);
                        else
                                /* partitions cannot be meaningful */
-                               warn |= check_partitions(fd, dname, 0);
+                               warn |= check_partitions(fd, dname, 0, 0);
                        if (strcmp(st->ss->name, "1.x") == 0 &&
                            st->minor_version >= 1 &&
                            did_default &&
@@ -420,7 +444,7 @@ int Create(struct supertype *st, char *mddev,
                        /* size is meaningful */
                        if (!st->ss->validate_geometry(st, level, layout,
                                                       raiddisks,
-                                                      chunk, minsize*2,
+                                                      &chunk, minsize*2,
                                                       NULL, NULL, 0)) {
                                fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
                                return 1;
@@ -823,7 +847,6 @@ int Create(struct supertype *st, char *mddev,
                                                Name ": ADD_NEW_DISK for %s "
                                                "failed: %s\n",
                                                dv->devname, strerror(errno));
-                                       st->ss->free_super(st);
                                        goto abort;
                                }
                                break;
@@ -866,10 +889,10 @@ int Create(struct supertype *st, char *mddev,
                        map_unlock(&map);
 
                        flush_metadata_updates(st);
+                       st->ss->free_super(st);
                }
        }
        free(infos);
-       st->ss->free_super(st);
 
        if (level == LEVEL_CONTAINER) {
                /* No need to start.  But we should signal udev to
@@ -917,7 +940,7 @@ int Create(struct supertype *st, char *mddev,
                        if (need_mdmon)
                                start_mdmon(st->container_dev);
 
-                       ping_monitor(devnum2devname(st->container_dev));
+                       ping_monitor_by_id(st->container_dev);
                        close(container_fd);
                }
                wait_for(chosen_name, mdfd);