]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Assemble.c
mdadm: add the ability to change cluster name
[thirdparty/mdadm.git] / Assemble.c
index a0041c6f11204c9f1ffc09dbffe0a73846d8bc28..12ac299f2bf3c582e6619de2f6588704f71e6990 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2012 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -48,7 +48,7 @@ static int name_matches(char *found, char *required, char *homehost)
 static int is_member_busy(char *metadata_version)
 {
        /* check if the given member array is active */
-       struct mdstat_ent *mdstat = mdstat_read(1, 0);
+       struct mdstat_ent *mdstat = mdstat_read(0, 0);
        struct mdstat_ent *ent;
        int busy = 0;
 
@@ -171,8 +171,20 @@ static int select_devices(struct mddev_dev *devlist,
                if (tmpdev->used > 1)
                        continue;
 
-               if (ident->devices &&
-                   !match_oneof(ident->devices, devname)) {
+               if (ident->container) {
+                       if (ident->container[0] == '/' &&
+                           !same_dev(ident->container, devname)) {
+                               if (report_mismatch)
+                                       pr_err("%s is not the container required (%s)\n",
+                                              devname, ident->container);
+                               continue;
+                       }
+               } else if (ident->devices &&
+                          !match_oneof(ident->devices, devname)) {
+                       /* Note that we ignore the "device=" identifier if a
+                        * "container=" is given.  Checking both is unnecessarily
+                        * complicated.
+                        */
                        if (report_mismatch)
                                pr_err("%s is not one of %s\n", devname, ident->devices);
                        continue;
@@ -221,8 +233,7 @@ static int select_devices(struct mddev_dev *devlist,
                                   !conf_test_metadata(tst->ss->name, (pol = devid_policy(stb.st_rdev)),
                                                       tst->ss->match_home(tst, c->homehost) == 1)) {
                                if (report_mismatch)
-                                       pr_err("%s has metadata type %s for which "
-                                              "auto-assembly is disabled\n",
+                                       pr_err("%s has metadata type %s for which auto-assembly is disabled\n",
                                               devname, tst->ss->name);
                                tmpdev->used = 2;
                        } else
@@ -247,8 +258,7 @@ static int select_devices(struct mddev_dev *devlist,
                                   !conf_test_metadata(tst->ss->name, (pol = devid_policy(stb.st_rdev)),
                                                       tst->ss->match_home(tst, c->homehost) == 1)) {
                                if (report_mismatch)
-                                       pr_err("%s has metadata type %s for which "
-                                              "auto-assembly is disabled\n",
+                                       pr_err("%s has metadata type %s for which auto-assembly is disabled\n",
                                               devname, tst->ss->name);
                                tmpdev->used = 2;
                        }
@@ -289,29 +299,20 @@ static int select_devices(struct mddev_dev *devlist,
                        }
                        close(dfd);
 
-                       if (ident->container) {
-                               if (ident->container[0] == '/' &&
-                                   !same_dev(ident->container, devname)) {
+                       if (ident->container && ident->container[0] != '/') {
+                               /* we have a uuid */
+                               int uuid[4];
+
+                               content = *contentp;
+                               tst->ss->getinfo_super(tst, content, NULL);
+
+                               if (!parse_uuid(ident->container, uuid) ||
+                                   !same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
                                        if (report_mismatch)
-                                               pr_err("%s is not the container required (%s)\n",
-                                                      devname, ident->container);
+                                               pr_err("%s has wrong UUID to be required container\n",
+                                                      devname);
                                        goto loop;
                                }
-                               if (ident->container[0] != '/') {
-                                       /* we have a uuid */
-                                       int uuid[4];
-
-                                       content = *contentp;
-                                       tst->ss->getinfo_super(tst, content, NULL);
-
-                                       if (!parse_uuid(ident->container, uuid) ||
-                                           !same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
-                                               if (report_mismatch)
-                                                       pr_err("%s has wrong UUID to be required container\n",
-                                                              devname);
-                                               goto loop;
-                                       }
-                               }
                        }
                        /* It is worth looking inside this container.
                         */
@@ -347,8 +348,7 @@ static int select_devices(struct mddev_dev *devlist,
 
                        st = tst; tst = NULL;
                        if (!auto_assem && inargv && tmpdev->next != NULL) {
-                               pr_err("%s is a container, but is not "
-                                      "only device given: confused and aborting\n",
+                               pr_err("%s is a container, but is not only device given: confused and aborting\n",
                                       devname);
                                st->ss->free_super(st);
                                dev_policy_free(pol);
@@ -363,9 +363,6 @@ static int select_devices(struct mddev_dev *devlist,
                        tmpdev = NULL;
                        goto loop;
                } else {
-                       int rv = 0;
-                       struct mddev_ident *match;
-
                        content = *contentp;
                        tst->ss->getinfo_super(tst, content, NULL);
 
@@ -374,25 +371,33 @@ static int select_devices(struct mddev_dev *devlist,
                                           report_mismatch ? devname : NULL))
                                goto loop;
 
-                       match = conf_match(tst, content, devname,
-                                          report_mismatch ? c->verbose : -1,
-                                          &rv);
-                       if (!match && rv == 2)
-                               goto loop;
-                       if (match && match->devname &&
-                           strcasecmp(match->devname, "<ignore>") == 0) {
-                               if (report_mismatch)
-                                       pr_err("%s is a member of an explicitly ignored array\n",
-                                              devname);
-                               goto loop;
-                       }
-                       if (match && !ident_matches(match, content, tst,
-                                                   c->homehost, c->update,
-                                                   report_mismatch ? devname : NULL))
-                               /* Array exists  in mdadm.conf but some
-                                * details don't match, so reject it
+                       if (auto_assem) {
+                               /* Never auto-assemble things that conflict
+                                * with mdadm.conf in some way
                                 */
-                               goto loop;
+                               struct mddev_ident *match;
+                               int rv = 0;
+
+                               match = conf_match(tst, content, devname,
+                                                  report_mismatch ? c->verbose : -1,
+                                                  &rv);
+                               if (!match && rv == 2)
+                                       goto loop;
+                               if (match && match->devname &&
+                                   strcasecmp(match->devname, "<ignore>") == 0) {
+                                       if (report_mismatch)
+                                               pr_err("%s is a member of an explicitly ignored array\n",
+                                                      devname);
+                                       goto loop;
+                               }
+                               if (match && !ident_matches(match, content, tst,
+                                                           c->homehost, c->update,
+                                                           report_mismatch ? devname : NULL))
+                                       /* Array exists  in mdadm.conf but some
+                                        * details don't match, so reject it
+                                        */
+                                       goto loop;
+                       }
 
                        /* should be safe to try an exclusive open now, we
                         * have rejected anything that some other mdadm might
@@ -548,7 +553,7 @@ struct devs {
 };
 
 static int load_devices(struct devs *devices, char *devmap,
-                       struct mddev_ident *ident, struct supertype *st,
+                       struct mddev_ident *ident, struct supertype **stp,
                        struct mddev_dev *devlist, struct context *c,
                        struct mdinfo *content,
                        int mdfd, char *mddev,
@@ -561,24 +566,25 @@ static int load_devices(struct devs *devices, char *devmap,
 #ifndef MDASSEMBLE
        int bitmap_done = 0;
 #endif
-       int most_recent = 0;
+       int most_recent = -1;
        int bestcnt = 0;
        int *best = *bestp;
+       struct supertype *st = *stp;
 
        for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) {
                char *devname = tmpdev->devname;
                struct stat stb;
+               struct supertype *tst;
                int i;
+               int dfd;
 
                if (tmpdev->used != 1)
                        continue;
                /* looks like a good enough match to update the super block if needed */
 #ifndef MDASSEMBLE
                if (c->update) {
-                       int dfd;
                        /* prepare useful information in info structures */
                        struct stat stb2;
-                       struct supertype *tst;
                        int err;
                        fstat(mdfd, &stb2);
 
@@ -607,6 +613,9 @@ static int load_devices(struct devs *devices, char *devmap,
                                close(mdfd);
                                free(devices);
                                free(devmap);
+                               tst->ss->free_super(tst);
+                               free(tst);
+                               *stp = st;
                                return -1;
                        }
                        tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks);
@@ -617,15 +626,17 @@ static int load_devices(struct devs *devices, char *devmap,
 
                        if (strcmp(c->update, "byteorder") == 0)
                                err = 0;
-                       else
+                       else if (strcmp(c->update, "home-cluster") == 0) {
+                               tst->cluster_name = c->homecluster;
+                               tst->ss->write_bitmap(tst, dfd, NameUpdate);
+                       } else
                                err = tst->ss->update_super(tst, content, c->update,
                                                            devname, c->verbose,
                                                            ident->uuid_set,
                                                            c->homehost);
                        if (err < 0) {
                                if (err == -1)
-                                       pr_err("--update=%s not understood"
-                                              " for %s metadata\n",
+                                       pr_err("--update=%s not understood for %s metadata\n",
                                               c->update, tst->ss->name);
                                tst->ss->free_super(tst);
                                free(tst);
@@ -633,6 +644,7 @@ static int load_devices(struct devs *devices, char *devmap,
                                close(dfd);
                                free(devices);
                                free(devmap);
+                               *stp = st;
                                return -1;
                        }
                        if (strcmp(c->update, "uuid")==0 &&
@@ -643,7 +655,6 @@ static int load_devices(struct devs *devices, char *devmap,
                        if (tst->ss->store_super(tst, dfd))
                                pr_err("Could not re-write superblock on %s.\n",
                                       devname);
-                       close(dfd);
 
                        if (strcmp(c->update, "uuid")==0 &&
                            ident->bitmap_fd >= 0 && !bitmap_done) {
@@ -654,15 +665,13 @@ static int load_devices(struct devs *devices, char *devmap,
                                else
                                        bitmap_done = 1;
                        }
-                       tst->ss->free_super(tst);
                } else
 #endif
                {
-                       struct supertype *tst = dup_super(st);
-                       int dfd;
                        dfd = dev_open(devname,
                                       tmpdev->disposition == 'I'
                                       ? O_RDWR : (O_RDWR|O_EXCL));
+                       tst = dup_super(st);
 
                        if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
                                pr_err("cannot re-read metadata from %s - aborting\n",
@@ -672,14 +681,16 @@ static int load_devices(struct devs *devices, char *devmap,
                                close(mdfd);
                                free(devices);
                                free(devmap);
+                               tst->ss->free_super(tst);
+                               free(tst);
+                               *stp = st;
                                return -1;
                        }
                        tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks);
-                       tst->ss->free_super(tst);
-                       close(dfd);
                }
 
-               stat(devname, &stb);
+               fstat(dfd, &stb);
+               close(dfd);
 
                if (c->verbose > 0)
                        pr_err("%s is identified as a member of %s, slot %d%s.\n",
@@ -692,10 +703,18 @@ static int load_devices(struct devs *devices, char *devmap,
                devices[devcnt].i.disk.major = major(stb.st_rdev);
                devices[devcnt].i.disk.minor = minor(stb.st_rdev);
 
-               if (devices[devcnt].i.events
-                   > devices[most_recent].i.events &&
-                   devices[devcnt].i.disk.state == 6)
+               if (devices[devcnt].i.disk.state == 6) {
+                       if (most_recent < 0 ||
+                           devices[devcnt].i.events
+                           > devices[most_recent].i.events) {
+                               struct supertype *tmp = tst;
+                               tst = st;
+                               st = tmp;
                                most_recent = devcnt;
+                       }
+               }
+               tst->ss->free_super(tst);
+               free(tst);
 
                if (content->array.level == LEVEL_MULTIPATH)
                        /* with multipath, the raid_disk from the superblock is meaningless */
@@ -741,12 +760,9 @@ static int load_devices(struct devs *devices, char *devmap,
                                 * Could be a mis-detection caused by overlapping
                                 * partitions.  fail-safe.
                                 */
-                               pr_err("WARNING %s and %s appear"
-                                      " to have very similar superblocks.\n"
-                                      "      If they are really different, "
-                                      "please --zero the superblock on one\n"
-                                      "      If they are the same or overlap,"
-                                      " please remove one from %s.\n",
+                               pr_err("WARNING %s and %s appear to have very similar superblocks.\n"
+                                      "      If they are really different, please --zero the superblock on one\n"
+                                      "      If they are the same or overlap, please remove one from %s.\n",
                                       devices[best[i]].devname, devname,
                                       inargv ? "the list" :
                                       "the\n      DEVICE list in mdadm.conf"
@@ -754,6 +770,7 @@ static int load_devices(struct devs *devices, char *devmap,
                                close(mdfd);
                                free(devices);
                                free(devmap);
+                               *stp = st;
                                return -1;
                        }
                        if (best[i] == -1
@@ -763,9 +780,11 @@ static int load_devices(struct devs *devices, char *devmap,
                }
                devcnt++;
        }
-       *most_recentp = most_recent;
+       if (most_recent >= 0)
+               *most_recentp = most_recent;
        *bestcntp = bestcnt;
        *bestp = best;
+       *stp = st;
        return devcnt;
 }
 
@@ -797,14 +816,41 @@ static int force_array(struct mdinfo *content,
                int chosen_drive = -1;
                int i;
 
-               for (i = 0; i < content->array.raid_disks && i < bestcnt; i++) {
+               for (i = 0;
+                    i < content->array.raid_disks * 2 && i < bestcnt;
+                    i += 2) {
                        int j = best[i];
-                       if (j>=0 &&
-                           !devices[j].uptodate &&
-                           devices[j].i.recovery_start == MaxSector &&
-                           (chosen_drive < 0 ||
+                       if (j < 0)
+                               continue;
+                       if (devices[j].uptodate)
+                               continue;
+                       if (devices[j].i.recovery_start != MaxSector) {
+                               int delta;
+                               if (!devices[j].i.reshape_active ||
+                                   devices[j].i.delta_disks <= 0)
+                                       continue;
+                               /* When increasing number of devices, an
+                                * added device also appears to be
+                                * recovering.  It is safe to include it
+                                * as long as it won't be a source of
+                                * data.
+                                * For now, just allow for last data
+                                * devices in RAID4 or last devices in RAID4/5/6.
+                                */
+                               delta = devices[j].i.delta_disks;
+                               if (devices[j].i.array.level >= 4 &&
+                                   devices[j].i.array.level <= 6 &&
+                                   i/2 >= content->array.raid_disks - delta)
+                                       /* OK */;
+                               else if (devices[j].i.array.level == 4 &&
+                                        i/2 >= content->array.raid_disks - delta - 1)
+                                       /* OK */;
+                               else
+                                       continue;
+                       }
+                       if (chosen_drive < 0 ||
                             devices[j].i.events
-                            > devices[chosen_drive].i.events))
+                           > devices[chosen_drive].i.events)
                                chosen_drive = j;
                }
                if (chosen_drive < 0)
@@ -857,7 +903,9 @@ static int force_array(struct mdinfo *content,
                /* If there are any other drives of the same vintage,
                 * add them in as well.  We can't lose and we might gain
                 */
-               for (i = 0; i < content->array.raid_disks && i < bestcnt ; i++) {
+               for (i = 0;
+                    i < content->array.raid_disks * 2 && i < bestcnt ;
+                    i += 2) {
                        int j = best[i];
                        if (j >= 0 &&
                            !devices[j].uptodate &&
@@ -940,8 +988,7 @@ static int start_array(int mdfd,
                        rv = add_disk(mdfd, st, content, &devices[j].i);
 
                        if (rv) {
-                               pr_err("failed to add "
-                                      "%s to %s: %s\n",
+                               pr_err("failed to add %s to %s: %s\n",
                                       devices[j].devname,
                                       mddev,
                                       strerror(errno));
@@ -965,21 +1012,40 @@ static int start_array(int mdfd,
                } else if (c->verbose > 0 && i < content->array.raid_disks*2
                           && (i&1) == 0)
                        pr_err("no uptodate device for slot %d of %s\n",
-                              i, mddev);
+                              i/2, mddev);
        }
 
        if (content->array.level == LEVEL_CONTAINER) {
                if (c->verbose >= 0) {
-                       pr_err("Container %s has been "
-                              "assembled with %d drive%s",
+                       pr_err("Container %s has been assembled with %d drive%s",
                               mddev, okcnt+sparecnt, okcnt+sparecnt==1?"":"s");
                        if (okcnt < (unsigned)content->array.raid_disks)
                                fprintf(stderr, " (out of %d)",
                                        content->array.raid_disks);
                        fprintf(stderr, "\n");
                }
+
+               if (st->ss->validate_container) {
+                       struct mdinfo *devices_list;
+                       struct mdinfo *info_devices = xmalloc(sizeof(struct mdinfo)*(okcnt+sparecnt));
+                       unsigned int count;
+                       devices_list = NULL;
+                       for (count = 0; count < okcnt+sparecnt; count++) {
+                               info_devices[count] = devices[count].i;
+                               info_devices[count].next = devices_list;
+                               devices_list = &info_devices[count];
+                       }
+                       if (st->ss->validate_container(devices_list))
+                               pr_err("Mismatch detected!\n");
+                       free(info_devices);
+               }
+
                st->ss->free_super(st);
                sysfs_uevent(content, "change");
+               if (err_ok && okcnt < (unsigned)content->array.raid_disks)
+                       /* Was partial, is still partial, so signal an error
+                        * to ensure we don't retry */
+                       return 1;
                return 0;
        }
 
@@ -1004,11 +1070,20 @@ static int start_array(int mdfd,
                if (content->reshape_active &&
                    !(content->reshape_active & RESHAPE_NO_BACKUP) &&
                    content->delta_disks <= 0) {
+                       if (!c->backup_file) {
+                               pr_err("%s: Need a backup file to complete reshape of this array.\n",
+                                      mddev);
+                               pr_err("Please provided one with \"--backup-file=...\"\n");
+                               if (c->update &&
+                                   strcmp(c->update, "revert-reshape") == 0)
+                                       pr_err("(Don't specify --update=revert-reshape again, that part succeeded.)\n");
+                               return 1;
+                       }
                        rv = sysfs_set_str(content, NULL,
                                           "array_state", "readonly");
                        if (rv == 0)
                                rv = Grow_continue(mdfd, st, content,
-                                                  c->backup_file,
+                                                  c->backup_file, 0,
                                                   c->freeze_reshape);
                } else if (c->readonly &&
                           sysfs_attribute_available(
@@ -1018,6 +1093,7 @@ static int start_array(int mdfd,
                } else
 #endif
                        rv = ioctl(mdfd, RUN_ARRAY, NULL);
+               reopen_mddev(mdfd); /* drop O_EXCL */
                if (rv == 0) {
                        if (c->verbose >= 0) {
                                pr_err("%s has been started with %d drive%s",
@@ -1083,15 +1159,12 @@ static int start_array(int mdfd,
 
                if (!enough(content->array.level, content->array.raid_disks,
                            content->array.layout, 1, avail))
-                       pr_err("Not enough devices to "
-                              "start the array.\n");
+                       pr_err("Not enough devices to start the array.\n");
                else if (!enough(content->array.level,
                                 content->array.raid_disks,
                                 content->array.layout, clean,
                                 avail))
-                       pr_err("Not enough devices to "
-                              "start the array while not clean "
-                              "- consider --force.\n");
+                       pr_err("Not enough devices to start the array while not clean - consider --force.\n");
 
                return 1;
        }
@@ -1116,9 +1189,7 @@ static int start_array(int mdfd,
                                 content->array.raid_disks,
                                 content->array.layout, clean,
                                 avail))
-                       fprintf(stderr, " - not enough to start the "
-                               "array while not clean - consider "
-                               "--force.\n");
+                       fprintf(stderr, " - not enough to start the array while not clean - consider --force.\n");
                else {
                        if (req_cnt == (unsigned)content->array.raid_disks)
                                fprintf(stderr, " - need all %d to start it", req_cnt);
@@ -1280,7 +1351,10 @@ try_again:
         */
        if (map_lock(&map))
                pr_err("failed to get exclusive lock on mapfile - continue anyway...\n");
-       mp = map_by_uuid(&map, content->uuid);
+       if (c->update && strcmp(c->update,"uuid") == 0)
+               mp = NULL;
+       else
+               mp = map_by_uuid(&map, content->uuid);
        if (mp) {
                struct mdinfo *dv;
                /* array already exists. */
@@ -1400,7 +1474,7 @@ try_again:
                /* This is a member of a container.  Try starting the array. */
                int err;
                err = assemble_container_content(st, mdfd, content, c,
-                                                chosen_name);
+                                                chosen_name, NULL);
                close(mdfd);
                return err;
        }
@@ -1408,7 +1482,7 @@ try_again:
        /* Ok, no bad inconsistancy, we can try updating etc */
        devices = xcalloc(num_devs, sizeof(*devices));
        devmap = xcalloc(num_devs, content->array.raid_disks);
-       devcnt = load_devices(devices, devmap, ident, st, devlist,
+       devcnt = load_devices(devices, devmap, ident, &st, devlist,
                              c, content, mdfd, mddev,
                              &most_recent, &bestcnt, &best, inargv);
        if (devcnt < 0)
@@ -1460,7 +1534,7 @@ try_again:
                /* If this device thinks that 'most_recent' has failed, then
                 * we must reject this device.
                 */
-               if (j != most_recent &&
+               if (j != most_recent && !c->force &&
                    content->array.raid_disks > 0 &&
                    devices[most_recent].i.disk.raid_disk >= 0 &&
                    devmap[j * content->array.raid_disks + devices[most_recent].i.disk.raid_disk] == 0) {
@@ -1483,9 +1557,7 @@ try_again:
                        if (i < content->array.raid_disks * 2) {
                                if (devices[j].i.recovery_start == MaxSector ||
                                    (content->reshape_active &&
-                                    ((i >= content->array.raid_disks - content->delta_disks) ||
-                                     (i >= content->array.raid_disks - content->delta_disks - 1
-                                      && content->array.level == 4)))) {
+                                    i >= content->array.raid_disks - content->delta_disks)) {
                                        if (!avail[i/2]) {
                                                okcnt++;
                                                avail[i/2]=1;
@@ -1513,7 +1585,7 @@ try_again:
         */
        chosen_drive = -1;
        st->ss->free_super(st);
-       for (i=0; chosen_drive < 0 && i<bestcnt; i++) {
+       for (i=0; chosen_drive < 0 && i<bestcnt; i+=2) {
                int j = best[i];
                int fd;
 
@@ -1640,9 +1712,10 @@ try_again:
                int err = 0;
                int *fdlist = xmalloc(sizeof(int)* bestcnt);
                if (c->verbose > 0)
-                       pr_err(":%s has an active reshape - checking "
-                              "if critical section needs to be restored\n",
+                       pr_err("%s has an active reshape - checking if critical section needs to be restored\n",
                               chosen_name);
+               if (!c->backup_file)
+                       c->backup_file = locate_backup(content->sys_name);
                enable_fds(bestcnt/2);
                for (i = 0; i < bestcnt/2; i++) {
                        int j = best[i*2];
@@ -1667,8 +1740,7 @@ try_again:
                                                   c->backup_file, c->verbose > 0);
                        if (err && c->invalid_backup) {
                                if (c->verbose > 0)
-                                       pr_err("continuing"
-                                              " without restoring backup\n");
+                                       pr_err("continuing without restoring backup\n");
                                err = 0;
                        }
                }
@@ -1752,18 +1824,20 @@ try_again:
 #ifndef MDASSEMBLE
 int assemble_container_content(struct supertype *st, int mdfd,
                               struct mdinfo *content, struct context *c,
-                              char *chosen_name)
+                              char *chosen_name, int *result)
 {
-       struct mdinfo *dev, *sra;
+       struct mdinfo *dev, *sra, *dev2;
        int working = 0, preexist = 0;
        int expansion = 0;
        struct map_ent *map = NULL;
        int old_raid_disks;
        int start_reshape;
+       char *avail = NULL;
+       int err;
 
        sysfs_init(content, mdfd, NULL);
 
-       sra = sysfs_read(mdfd, NULL, GET_VERSION);
+       sra = sysfs_read(mdfd, NULL, GET_VERSION|GET_DEVS);
        if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0) {
                if (content->array.major_version == -1 &&
                    content->array.minor_version == -2 &&
@@ -1790,10 +1864,27 @@ int assemble_container_content(struct supertype *st, int mdfd,
        if (st->ss->external && content->recovery_blocked && start_reshape)
                block_subarray(content);
 
-       if (sra)
-               sysfs_free(sra);
+       for (dev2 = sra->devs; dev2; dev2 = dev2->next) {
+               for (dev = content->devs; dev; dev = dev->next)
+                       if (dev2->disk.major == dev->disk.major &&
+                           dev2->disk.minor == dev->disk.minor)
+                               break;
+               if (dev)
+                       continue;
+               /* Don't want this one any more */
+               if (sysfs_set_str(sra, dev2, "slot", "none") < 0 &&
+                   errno == EBUSY) {
+                       pr_err("Cannot remove old device %s: not updating %s\n", dev2->sys_name, sra->sys_name);
+                       sysfs_free(sra);
+                       return 1;
+               }
+               sysfs_set_str(sra, dev2, "state", "remove");
+       }
        old_raid_disks = content->array.raid_disks - content->delta_disks;
-       for (dev = content->devs; dev; dev = dev->next)
+       avail = xcalloc(content->array.raid_disks, 1);
+       for (dev = content->devs; dev; dev = dev->next) {
+               if (dev->disk.raid_disk >= 0)
+                       avail[dev->disk.raid_disk] = 1;
                if (sysfs_add_disk(content, dev, 1) == 0) {
                        if (dev->disk.raid_disk >= old_raid_disks &&
                            content->reshape_active)
@@ -1802,100 +1893,127 @@ int assemble_container_content(struct supertype *st, int mdfd,
                                working++;
                } else if (errno == EEXIST)
                        preexist++;
-       if (working + expansion == 0)
+       }
+       sysfs_free(sra);
+       if (working + expansion == 0 && c->runstop <= 0) {
+               free(avail);
                return 1;/* Nothing new, don't try to start */
-
+       }
        map_update(&map, fd2devnm(mdfd),
                   content->text_version,
                   content->uuid, chosen_name);
 
-       if (c->runstop > 0 ||
-           (working + preexist + expansion) >=
-           content->array.working_disks) {
-               int err;
-
-               if (start_reshape) {
-                       int spare = content->array.raid_disks + expansion;
-                       if (restore_backup(st, content,
-                                          working,
-                                          spare, c->backup_file, c->verbose) == 1)
-                               return 1;
-
-                       err = sysfs_set_str(content, NULL,
-                                           "array_state", "readonly");
-                       if (err)
-                               return 1;
-
-                       if (st->ss->external) {
-                               if (!mdmon_running(st->container_devnm))
-                                       start_mdmon(st->container_devnm);
-                               ping_monitor(st->container_devnm);
-                               if (mdmon_running(st->container_devnm) &&
-                                   st->update_tail == NULL)
-                                       st->update_tail = &st->updates;
-                       }
 
-                       err = Grow_continue(mdfd, st, content, c->backup_file,
-                                           c->freeze_reshape);
-               } else switch(content->array.level) {
-                       case LEVEL_LINEAR:
-                       case LEVEL_MULTIPATH:
-                       case 0:
-                               err = sysfs_set_str(content, NULL, "array_state",
-                                                   c->readonly ? "readonly" : "active");
-                               break;
-                       default:
-                               err = sysfs_set_str(content, NULL, "array_state",
-                                                   "readonly");
-                               /* start mdmon if needed. */
-                               if (!err) {
-                                       if (!mdmon_running(st->container_devnm))
-                                               start_mdmon(st->container_devnm);
-                                       ping_monitor(st->container_devnm);
-                               }
-                               break;
-                       }
-               if (!err)
-                       sysfs_set_safemode(content, content->safe_mode_delay);
-
-               /* Block subarray here if it is not reshaped now
-                * It has be blocked a little later to allow mdmon to switch in
-                * in to R/W state
-                */
-               if (st->ss->external && content->recovery_blocked &&
-                   !start_reshape)
-                       block_subarray(content);
-
-               if (c->verbose >= 0) {
-                       if (err)
-                               pr_err("array %s now has %d device%s",
-                                      chosen_name, working + preexist,
-                                      working + preexist == 1 ? "":"s");
-                       else
-                               pr_err("Started %s with %d device%s",
-                                      chosen_name, working + preexist,
-                                      working + preexist == 1 ? "":"s");
+       if (enough(content->array.level, content->array.raid_disks,
+                  content->array.layout, content->array.state & 1, avail) == 0) {
+               if (c->export && result)
+                       *result |= INCR_NO;
+               else if (c->verbose >= 0) {
+                       pr_err("%s assembled with %d device%s",
+                              chosen_name, preexist + working,
+                              preexist + working == 1 ? "":"s");
                        if (preexist)
                                fprintf(stderr, " (%d new)", working);
-                       if (expansion)
-                               fprintf(stderr, " ( + %d for expansion)",
-                                       expansion);
-                       fprintf(stderr, "\n");
+                       fprintf(stderr, " but not started\n");
                }
-               if (!err)
-                       wait_for(chosen_name, mdfd);
-               return err;
-               /* FIXME should have an O_EXCL and wait for read-auto */
-       } else {
-               if (c->verbose >= 0) {
+               free(avail);
+               return 1;
+       }
+       free(avail);
+
+       if (c->runstop <= 0 &&
+           (working + preexist + expansion) <
+           content->array.working_disks) {
+               if (c->export && result)
+                       *result |= INCR_UNSAFE;
+               else if (c->verbose >= 0) {
                        pr_err("%s assembled with %d device%s",
                               chosen_name, preexist + working,
                               preexist + working == 1 ? "":"s");
                        if (preexist)
                                fprintf(stderr, " (%d new)", working);
-                       fprintf(stderr, " but not started\n");
+                       fprintf(stderr, " but not safe to start\n");
                }
                return 1;
        }
+
+
+       if (start_reshape) {
+               int spare = content->array.raid_disks + expansion;
+               if (restore_backup(st, content,
+                                  working,
+                                  spare, &c->backup_file, c->verbose) == 1)
+                       return 1;
+
+               err = sysfs_set_str(content, NULL,
+                                   "array_state", "readonly");
+               if (err)
+                       return 1;
+
+               if (st->ss->external) {
+                       if (!mdmon_running(st->container_devnm))
+                               start_mdmon(st->container_devnm);
+                       ping_monitor(st->container_devnm);
+                       if (mdmon_running(st->container_devnm) &&
+                           st->update_tail == NULL)
+                               st->update_tail = &st->updates;
+               }
+
+               err = Grow_continue(mdfd, st, content, c->backup_file,
+                                   0, c->freeze_reshape);
+       } else switch(content->array.level) {
+               case LEVEL_LINEAR:
+               case LEVEL_MULTIPATH:
+               case 0:
+                       err = sysfs_set_str(content, NULL, "array_state",
+                                           c->readonly ? "readonly" : "active");
+                       break;
+               default:
+                       err = sysfs_set_str(content, NULL, "array_state",
+                                           "readonly");
+                       /* start mdmon if needed. */
+                       if (!err) {
+                               if (!mdmon_running(st->container_devnm))
+                                       start_mdmon(st->container_devnm);
+                               ping_monitor(st->container_devnm);
+                       }
+                       break;
+               }
+       if (!err)
+               sysfs_set_safemode(content, content->safe_mode_delay);
+
+       /* Block subarray here if it is not reshaped now
+        * It has be blocked a little later to allow mdmon to switch in
+        * in to R/W state
+        */
+       if (st->ss->external && content->recovery_blocked &&
+           !start_reshape)
+               block_subarray(content);
+
+       if (c->export && result) {
+               if (err)
+                       *result |= INCR_NO;
+               else
+                       *result |= INCR_YES;
+       } else if (c->verbose >= 0) {
+               if (err)
+                       pr_err("array %s now has %d device%s",
+                              chosen_name, working + preexist,
+                              working + preexist == 1 ? "":"s");
+               else
+                       pr_err("Started %s with %d device%s",
+                              chosen_name, working + preexist,
+                              working + preexist == 1 ? "":"s");
+               if (preexist)
+                       fprintf(stderr, " (%d new)", working);
+               if (expansion)
+                       fprintf(stderr, " ( + %d for expansion)",
+                               expansion);
+               fprintf(stderr, "\n");
+       }
+       if (!err)
+               wait_for(chosen_name, mdfd);
+       return err;
+       /* FIXME should have an O_EXCL and wait for read-auto */
 }
 #endif