Makefile/version: use version/date from .git if possible.

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index a4aab41f24ff8f8919a10be8ffc2437e8055cf7b..ac22f77c92d3e5205bcb7773b8958ae6d88eb3a4 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -299,7 +299,7 @@ int Create(struct supertype *st, char *mddev,
                        missing_disks ++;
                        continue;
                }
-               if (data_offset != VARIABLE_OFFSET) {
+               if (data_offset == VARIABLE_OFFSET) {
                        doff = strchr(dname, ':');
                        if (doff) {
                                *doff++ = 0;
@@ -506,6 +506,17 @@ int Create(struct supertype *st, char *mddev,
                                pr_err("size set to %lluK\n", s->size);
                }
        }
+
+       if (!s->bitmap_file &&
+           s->level >= 1 &&
+           (s->write_behind || s->size > 100*1024*1024ULL)) {
+               if (c->verbose > 0)
+                       pr_err("automatically enabling write-intent bitmap on large array\n");
+               s->bitmap_file = "internal";
+       }
+       if (s->bitmap_file && strcmp(s->bitmap_file, "none") == 0)
+               s->bitmap_file = NULL;
+
        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",
@@ -676,6 +687,7 @@ int Create(struct supertype *st, char *mddev,
                /* base name on mddev */
                /*  /dev/md0 -> 0
                 *  /dev/md_d0 -> d0
+                *  /dev/md_foo -> foo
                 *  /dev/md/1 -> 1
                 *  /dev/md/d1 -> d1
                 *  /dev/md/home -> home
@@ -685,9 +697,8 @@ int Create(struct supertype *st, char *mddev,
                name = strrchr(mddev, '/');
                if (name) {
                        name++;
-                       if (strncmp(name, "md_d", 4)==0 &&
-                           strlen(name) > 4 &&
-                           isdigit(name[4]) &&
+                       if (strncmp(name, "md_", 3)==0 &&
+                           strlen(name) > 3 &&
                            (name-mddev) == 5 /* /dev/ */)
                                name += 3;
                        else if (strncmp(name, "md", 2)==0 &&
@@ -821,7 +832,7 @@ int Create(struct supertype *st, char *mddev,
        }
 
        infos = xmalloc(sizeof(*infos) * total_slots);
-
+       enable_fds(total_slots);
        for (pass=1; pass <=2 ; pass++) {
                struct mddev_dev *moved_disk = NULL; /* the disk that was moved out of the insert point */
 
@@ -1016,6 +1027,11 @@ int Create(struct supertype *st, char *mddev,
                                ioctl(mdfd, STOP_ARRAY, NULL);
                                goto abort;
                        }
+                       /* if start_ro module parameter is set, array is
+                        * auto-read-only, which is bad as the resync won't
+                        * start.  So lets make it read-write now.
+                        */
+                       ioctl(mdfd, RESTART_ARRAY_RW, NULL);
                }
                if (c->verbose >= 0)
                        pr_err("array %s started.\n", mddev);