Grow: Fixup a pile of cosmetic issues

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index 40f1b7ea81be67015570ad0c4eefb067c162a245..10e7d108956d9ae5504458f258bd1e43cfec1662 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -114,8 +114,13 @@ int Create(struct supertype *st, char *mddev,
        unsigned long long newsize;
 
        int major_num = BITMAP_MAJOR_HI;
-       if (s->bitmap_file && strcmp(s->bitmap_file, "clustered") == 0)
+       if (s->bitmap_file && strcmp(s->bitmap_file, "clustered") == 0) {
                major_num = BITMAP_MAJOR_CLUSTERED;
+               if (c->nodes <= 1) {
+                       pr_err("At least 2 nodes are needed for cluster-md\n");
+                       return 1;
+               }
+       }
 
        memset(&info, 0, sizeof(info));
        if (s->level == UnSet && st && st->ss->default_geometry)
@@ -254,7 +259,8 @@ int Create(struct supertype *st, char *mddev,
        if (st && ! st->ss->validate_geometry(st, s->level, s->layout, s->raiddisks,
                                              &s->chunk, s->size*2,
                                              data_offset, NULL,
-                                             &newsize, c->verbose>=0))
+                                             &newsize, s->consistency_policy,
+                                             c->verbose>=0))
                return 1;
 
        if (s->chunk && s->chunk != UnSet) {
@@ -330,7 +336,7 @@ int Create(struct supertype *st, char *mddev,
                }
                close(dfd);
                info.array.working_disks++;
-               if (dnum < s->raiddisks)
+               if (dnum < s->raiddisks && dv->disposition != 'j')
                        info.array.active_disks++;
                if (st == NULL) {
                        struct createinfo *ci = conf_get_create_info();
@@ -353,7 +359,8 @@ int Create(struct supertype *st, char *mddev,
                                                st, s->level, s->layout, s->raiddisks,
                                                &s->chunk, s->size*2,
                                                dv->data_offset, dname,
-                                               &freesize, c->verbose > 0)) {
+                                               &freesize, s->consistency_policy,
+                                               c->verbose > 0)) {
                                case -1: /* Not valid, message printed, and not
                                          * worth checking any further */
                                        exit(2);
@@ -390,6 +397,7 @@ int Create(struct supertype *st, char *mddev,
                                                       &s->chunk, s->size*2,
                                                       dv->data_offset,
                                                       dname, &freesize,
+                                                      s->consistency_policy,
                                                       c->verbose >= 0)) {
 
                                pr_err("%s is not suitable for this array.\n",
@@ -400,7 +408,7 @@ int Create(struct supertype *st, char *mddev,
                }
 
                if (dv->disposition == 'j')
-                       continue;  /* skip write journal for size check */
+                       goto skip_size_check;  /* skip write journal for size check */
 
                freesize /= 2; /* convert to K */
                if (s->chunk && s->chunk != UnSet) {
@@ -434,6 +442,7 @@ int Create(struct supertype *st, char *mddev,
                        mindisc = dname;
                        minsize = freesize;
                }
+       skip_size_check:
                if (c->runstop != 1 || c->verbose >= 0) {
                        int fd = open(dname, O_RDONLY);
                        if (fd <0 ) {
@@ -495,7 +504,8 @@ int Create(struct supertype *st, char *mddev,
                                                       s->raiddisks,
                                                       &s->chunk, minsize*2,
                                                       data_offset,
-                                                      NULL, NULL, 0)) {
+                                                      NULL, NULL,
+                                                      s->consistency_policy, 0)) {
                                pr_err("devices too large for RAID level %d\n", s->level);
                                return 1;
                        }
@@ -514,6 +524,8 @@ int Create(struct supertype *st, char *mddev,
        if (!s->bitmap_file &&
            s->level >= 1 &&
            st->ss->add_internal_bitmap &&
+           (s->consistency_policy != CONSISTENCY_POLICY_RESYNC &&
+            s->consistency_policy != CONSISTENCY_POLICY_PPL) &&
            (s->write_behind || s->size > 100*1024*1024ULL)) {
                if (c->verbose > 0)
                        pr_err("automatically enabling write-intent bitmap on large array\n");
@@ -522,6 +534,12 @@ int Create(struct supertype *st, char *mddev,
        if (s->bitmap_file && strcmp(s->bitmap_file, "none") == 0)
                s->bitmap_file = NULL;
 
+       if (s->consistency_policy == CONSISTENCY_POLICY_PPL &&
+           !st->ss->write_init_ppl) {
+               pr_err("%s metadata does not support PPL\n", st->ss->name);
+               return 1;
+       }
+
        if (!have_container && s->level > 0 && ((maxsize-s->size)*100 > maxsize)) {
                if (c->runstop != 1 || c->verbose >= 0)
                        pr_err("largest drive (%s) exceeds size (%lluK) by more than 1%%\n",
@@ -714,7 +732,7 @@ int Create(struct supertype *st, char *mddev,
                                name += 2;
                }
        }
-       if (!st->ss->init_super(st, &info.array, s->size, name, c->homehost, uuid,
+       if (!st->ss->init_super(st, &info.array, s, name, c->homehost, uuid,
                                data_offset))
                goto abort_locked;
 
@@ -768,9 +786,9 @@ int Create(struct supertype *st, char *mddev,
                                st->ss->name);
                        goto abort_locked;
                }
-               if (!st->ss->add_internal_bitmap(st, &s->bitmap_chunk,
-                                                c->delay, s->write_behind,
-                                                bitmapsize, 1, major_num)) {
+               if (st->ss->add_internal_bitmap(st, &s->bitmap_chunk,
+                                               c->delay, s->write_behind,
+                                               bitmapsize, 1, major_num)) {
                        pr_err("Given bitmap chunk size not supported.\n");
                        goto abort_locked;
                }
@@ -882,8 +900,10 @@ int Create(struct supertype *st, char *mddev,
                                else
                                        inf->disk.state = 0;
 
-                               if (dv->writemostly == 1)
+                               if (dv->writemostly == FlagSet)
                                        inf->disk.state |= (1<<MD_DISK_WRITEMOSTLY);
+                               if (dv->failfast == FlagSet)
+                                       inf->disk.state |= (1<<MD_DISK_FAILFAST);
 
                                if (have_container)
                                        fd = -1;