Add subarray field to supertype.

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index b7f0914329b79940db80577b615e3a73e6ea4052..495cf39a575c7c130287355efe7238fb6b6c11b6 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -76,6 +76,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        unsigned long long bitmapsize;
        struct mdinfo *sra;
        struct mdinfo info;
+       int did_default = 0;
 
        int major_num = BITMAP_MAJOR_HI;
 
@@ -289,12 +290,9 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                        dname);
                                exit(2);
                        }
-                       if (st->ss->major != 0 ||
+                       if (st->ss != &super0 ||
                            st->minor_version != 90)
-                               fprintf(stderr, Name ": Defaulting to version"
-                                       " %d.%d metadata\n",
-                                       st->ss->major,
-                                       st->minor_version);
+                               did_default = 1;
                } else {
                        if (!st->ss->validate_geometry(st, level, layout,
                                                       raiddisks,
@@ -356,9 +354,12 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                }
                if (level > 0 || level == LEVEL_MULTIPATH
                    || level == LEVEL_FAULTY
-                   || (st && st->ss->external) ) {
+                   || st->ss->external ) {
                        /* size is meaningful */
-                       if (minsize > 0x100000000ULL && st->ss->major == 0) {
+                       if (!st->ss->validate_geometry(st, level, layout,
+                                                      raiddisks,
+                                                      chunk, minsize,
+                                                      NULL, NULL)) {
                                fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
                                return 1;
                        }
@@ -441,6 +442,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
             ( level == 6 && (insert_point < raiddisks
                              || second_missing < raiddisks))
             ||
+            ( level <= 0 )
+            ||
             assume_clean
                )
                info.array.state = 1; /* clean, but one+ drive will be missing*/
@@ -483,7 +486,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                + info.array.failed_disks;
        info.array.layout = layout;
        info.array.chunk_size = chunk*1024;
-       info.array.major_version = st->ss->major;
+       info.array.major_version = 0; /* Flag to say "not zeroing superblock" */
 
        if (name == NULL || *name == 0) {
                /* base name on mddev */
@@ -514,6 +517,10 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 
        st->ss->getinfo_super(st, &info);
 
+       if (did_default)
+               fprintf(stderr, Name ": Defaulting to version"
+                       " %s metadata\n", info.text_version);
+
        if (bitmap_file && vers < 9003) {
                major_num = BITMAP_MAJOR_HOSTENDIAN;
 #ifdef __BIG_ENDIAN
@@ -541,15 +548,11 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 
        if (st->ss->external) {
                char ver[100];
-               if (st->ss->external == 1)
-                       /* container */
-                       strcat(strcpy(ver, "external:"),
-                              info.text_version);
-               else {
+               strcat(strcpy(ver, "external:"),
+                      info.text_version);
+               if (st->ss->external && st->subarray[0]) {
                        /* member */
-                       sprintf(ver, "external:/%s/%d",
-                               devnum2devname(st->container_dev),
-                               st->container_member);
+
                        /* When creating a member, we need to be careful
                         * to negotiate with mdmon properly.
                         * If it is already running, we cannot write to
@@ -588,8 +591,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        } else  if ((vers % 100) >= 1) { /* can use different versions */
                mdu_array_info_t inf;
                memset(&inf, 0, sizeof(inf));
-               inf.major_version = st->ss->major;
-               inf.minor_version = st->minor_version;
+               inf.major_version = info.array.major_version;
+               inf.minor_version = info.array.minor_version;
                rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
        } else
                rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
@@ -648,7 +651,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                            strcasecmp(dv->devname, "missing")==0)
                                continue;
 
-                       if (st->ss->external == 2)
+                       if (st->ss->external && st->subarray[0])
                                fd = open(dv->devname, O_RDWR, 0);
                        else
                                fd = open(dv->devname, O_RDWR|O_EXCL,0);
@@ -729,7 +732,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                }
                if (verbose >= 0)
                        fprintf(stderr, Name ": array %s started.\n", mddev);
-               if (st->ss->external == 2) {
+               if (st->ss->external && st->subarray[0]) {
                        if (need_mdmon) {
                                int dn = st->container_dev;
                                int i;