]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Assemble.c
Add 'supertype' arg to almost all metadata methods.
[thirdparty/mdadm.git] / Assemble.c
index e762c693e502321a7c1e87d495a07f521714f11b..7837b19bf4f2c61924eeacd3f58568cebffd1278 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2002 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
  */
 
 #include       "mdadm.h"
+#include       <ctype.h>
 
-int Assemble(char *mddev, int mdfd,
-            mddev_ident_t ident, char *conffile,
-            mddev_dev_t devlist,
+static int name_matches(char *found, char *required, char *homehost)
+{
+       /* See if the name found matches the required name, possibly
+        * prefixed with 'homehost'
+        */
+       char fnd[33];
+
+       strncpy(fnd, found, 32);
+       fnd[32] = 0;
+       if (strcmp(found, required)==0)
+               return 1;
+       if (homehost) {
+               int l = strlen(homehost);
+               if (l < 32 && fnd[l] == ':' &&
+                   strcmp(fnd+l+1, required)==0)
+                       return 1;
+       }
+       return 0;
+}
+
+int Assemble(struct supertype *st, char *mddev, int mdfd,
+            mddev_ident_t ident,
+            mddev_dev_t devlist, char *backup_file,
             int readonly, int runstop,
-            char *update,
+            char *update, char *homehost,
             int verbose, int force)
 {
        /*
@@ -66,7 +87,7 @@ int Assemble(char *mddev, int mdfd,
         *
         * If !uuidset and scan, look in conf-file for uuid
         *       If not found, give up
-        * If !devlist and scan and uuidset, get list of devs from conf-file 
+        * If !devlist and scan and uuidset, get list of devs from conf-file
         *
         * For each device:
         *   Check superblock - discard if bad
@@ -90,8 +111,10 @@ int Assemble(char *mddev, int mdfd,
         *    START_ARRAY
         *
         */
+       int clean = 0;
+       int must_close = 0;
        int old_linux = 0;
-       int vers;
+       int vers = 0; /* Keep gcc quite - it really is initialised */
        void *first_super = NULL, *super = NULL;
        struct {
                char *devname;
@@ -101,6 +124,7 @@ int Assemble(char *mddev, int mdfd,
                int uptodate;
                int state;
                int raid_disk;
+               int disk_nr;
        } *devices;
        int *best = NULL; /* indexed by raid_disk */
        unsigned int bestcnt = 0;
@@ -112,31 +136,36 @@ int Assemble(char *mddev, int mdfd,
        int chosen_drive;
        int change = 0;
        int inargv = 0;
-       int start_partial_ok = force || devlist==NULL;
+       int bitmap_done;
+       int start_partial_ok = (runstop >= 0) && (force || devlist==NULL || mdfd < 0);
        unsigned int num_devs;
        mddev_dev_t tmpdev;
        struct mdinfo info;
-       
-       vers = md_get_version(mdfd);
-       if (vers <= 0) {
-               fprintf(stderr, Name ": %s appears not to be an md device.\n", mddev);
-               return 1;
-       }
-       if (vers < 9000) {
-               fprintf(stderr, Name ": Assemble requires driver version 0.90.0 or later.\n"
-                       "    Upgrade your kernel or try --build\n");
-               return 1;
-       }
+       char *avail;
+       int nextspare = 0;
+
        if (get_linux_version() < 2004000)
                old_linux = 1;
 
-       if (ioctl(mdfd, GET_ARRAY_INFO, &info.array)>=0) {
-               fprintf(stderr, Name ": device %s already active - cannot assemble it\n",
-                       mddev);
-               return 1;
-       }
-       ioctl(mdfd, STOP_ARRAY, NULL); /* just incase it was started but has no content */
+       if (mdfd >= 0) {
+               vers = md_get_version(mdfd);
+               if (vers <= 0) {
+                       fprintf(stderr, Name ": %s appears not to be an md device.\n", mddev);
+                       return 1;
+               }
+               if (vers < 9000) {
+                       fprintf(stderr, Name ": Assemble requires driver version 0.90.0 or later.\n"
+                               "    Upgrade your kernel or try --build\n");
+                       return 1;
+               }
 
+               if (ioctl(mdfd, GET_ARRAY_INFO, &info.array)>=0) {
+                       fprintf(stderr, Name ": device %s already active - cannot assemble it\n",
+                               mddev);
+                       return 1;
+               }
+               ioctl(mdfd, STOP_ARRAY, NULL); /* just incase it was started but has no content */
+       }
        /*
         * If any subdevs are listed, then any that don't
         * match ident are discarded.  Remainder must all match and
@@ -150,138 +179,318 @@ int Assemble(char *mddev, int mdfd,
            ident->super_minor < 0 &&
            ident->devices == NULL) {
                fprintf(stderr, Name ": No identity information available for %s - cannot assemble.\n",
-                       mddev);
+                       mddev ? mddev : "further assembly");
                return 1;
        }
        if (devlist == NULL)
-               devlist = conf_get_devs(conffile);
-       else inargv = 1;
+               devlist = conf_get_devs();
+       else if (mdfd >= 0)
+               inargv = 1;
+
+ try_again:
 
        tmpdev = devlist; num_devs = 0;
        while (tmpdev) {
-               num_devs++;
+               if (tmpdev->used)
+                       tmpdev->used = 2;
+               else
+                       num_devs++;
                tmpdev = tmpdev->next;
        }
        devices = malloc(num_devs * sizeof(*devices));
 
+       if (!st && ident->st) st = ident->st;
 
-       if (verbose)
+       if (verbose>0)
            fprintf(stderr, Name ": looking for devices for %s\n",
-                   mddev);
+                   mddev ? mddev : "further assembly");
 
-       while ( devlist) {
-               char *devname;
+       /* first walk the list of devices to find a consistent set
+        * that match the criterea, if that is possible.
+        * We flag the one we like with 'used'.
+        */
+       for (tmpdev = devlist;
+            tmpdev;
+            tmpdev = tmpdev->next) {
+               char *devname = tmpdev->devname;
                int dfd;
                struct stat stb;
+               struct supertype *tst = st;
 
-               devname = devlist->devname;
-               devlist = devlist->next;
+               if (tmpdev->used > 1) continue;
 
                if (ident->devices &&
                    !match_oneof(ident->devices, devname)) {
-                       if (inargv || verbose)
+                       if ((inargv && verbose>=0) || verbose > 0)
                                fprintf(stderr, Name ": %s is not one of %s\n", devname, ident->devices);
                        continue;
                }
 
-               if (super) {
-                       free(super);
-                       super = NULL;
-               }
-               
-               dfd = open(devname, O_RDONLY|O_EXCL, 0);
+               dfd = dev_open(devname, O_RDONLY|O_EXCL);
                if (dfd < 0) {
-                       if (inargv || verbose)
+                       if ((inargv && verbose >= 0) || verbose > 0)
                                fprintf(stderr, Name ": cannot open device %s: %s\n",
                                        devname, strerror(errno));
+                       tmpdev->used = 2;
                } else if (fstat(dfd, &stb)< 0) {
                        /* Impossible! */
                        fprintf(stderr, Name ": fstat failed for %s: %s\n",
                                devname, strerror(errno));
-                       close(dfd);
+                       tmpdev->used = 2;
                } else if ((stb.st_mode & S_IFMT) != S_IFBLK) {
                        fprintf(stderr, Name ": %s is not a block device.\n",
                                devname);
-                       close(dfd);
-               } else if (load_super0(dfd, &super, NULL)) {
-                       if (inargv || verbose)
+                       tmpdev->used = 2;
+               } else if (!tst && (tst = guess_super(dfd)) == NULL) {
+                       if ((inargv && verbose >= 0) || verbose > 0)
+                               fprintf(stderr, Name ": no recogniseable superblock on %s\n",
+                                       devname);
+                       tmpdev->used = 2;
+               } else if (tst->ss->load_super(tst,dfd, &super, NULL)) {
+                       if ((inargv && verbose >= 0) || verbose > 0)
                                fprintf( stderr, Name ": no RAID superblock on %s\n",
                                         devname);
-                       close(dfd);
                } else {
-                       getinfo_super0(&info, super);
-                       close(dfd);
+                       tst->ss->getinfo_super(tst, &info, super);
                }
+               if (dfd >= 0) close(dfd);
 
-               if (ident->uuid_set &&
-                   (!super || same_uuid(info.uuid, ident->uuid)==0)) {
-                       if (inargv || verbose)
+               if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) &&
+                   (!super || same_uuid(info.uuid, ident->uuid, tst->ss->swapuuid)==0)) {
+                       if ((inargv && verbose >= 0) || verbose > 0)
                                fprintf(stderr, Name ": %s has wrong uuid.\n",
                                        devname);
-                       continue;
+                       goto loop;
+               }
+               if (ident->name[0] && (!update || strcmp(update, "name")!= 0) &&
+                   (!super || name_matches(info.name, ident->name, homehost)==0)) {
+                       if ((inargv && verbose >= 0) || verbose > 0)
+                               fprintf(stderr, Name ": %s has wrong name.\n",
+                                       devname);
+                       goto loop;
                }
                if (ident->super_minor != UnSet &&
                    (!super || ident->super_minor != info.array.md_minor)) {
-                       if (inargv || verbose)
+                       if ((inargv && verbose >= 0) || verbose > 0)
                                fprintf(stderr, Name ": %s has wrong super-minor.\n",
                                        devname);
-                       continue;
+                       goto loop;
                }
                if (ident->level != UnSet &&
                    (!super|| ident->level != info.array.level)) {
-                       if (inargv || verbose)
+                       if ((inargv && verbose >= 0) || verbose > 0)
                                fprintf(stderr, Name ": %s has wrong raid level.\n",
                                        devname);
-                       continue;
+                       goto loop;
                }
                if (ident->raid_disks != UnSet &&
                    (!super || ident->raid_disks!= info.array.raid_disks)) {
-                       if (inargv || verbose)
+                       if ((inargv && verbose >= 0) || verbose > 0)
                                fprintf(stderr, Name ": %s requires wrong number of drives.\n",
                                        devname);
-                       continue;
+                       goto loop;
                }
-
-               /* If we are this far, then we are commited to this device.
+               if (mdfd < 0) {
+                       if (tst == NULL || super == NULL)
+                               continue;
+                       if (update == NULL &&
+                           tst->ss->match_home(tst, super, homehost)==0) {
+                               if ((inargv && verbose >= 0) || verbose > 0)
+                                       fprintf(stderr, Name ": %s is not built for host %s.\n",
+                                               devname, homehost);
+                               /* Auto-assemble, and this is not a usable host */
+                               /* if update != NULL, we are updating the host
+                                * name... */
+                               goto loop;
+                       }
+               }
+               /* If we are this far, then we are nearly commited to this device.
                 * If the super_block doesn't exist, or doesn't match others,
-                * then we cannot continue
+                * then we probably cannot continue
+                * However if one of the arrays is for the homehost, and
+                * the other isn't that can disambiguate.
                 */
 
                if (!super) {
                        fprintf(stderr, Name ": %s has no superblock - assembly aborted\n",
                                devname);
-                       free(first_super);
+                       st->ss->free_super(st, first_super);
                        return 1;
                }
-               if (compare_super0(&first_super, super)) {
+
+               if (st == NULL)
+                       st = tst;
+               if (st->ss != tst->ss ||
+                   st->minor_version != tst->minor_version ||
+                   st->ss->compare_super(&first_super, super) != 0) {
+                       /* Some mismatch. If exactly one array matches this host,
+                        * we can resolve on that one.
+                        * Or, if we are auto assembling, we just ignore the second
+                        * for now.
+                        */
+                       if (mdfd < 0)
+                               goto loop;
+                       if (homehost) {
+                               int first = st->ss->match_home(st, first_super,
+                                                              homehost);
+                               int last = tst->ss->match_home(tst, super,
+                                                              homehost);
+                               if (first+last == 1) {
+                                       /* We can do something */
+                                       if (first) {/* just ignore this one */
+                                               if ((inargv && verbose >= 0) || verbose > 0)
+                                                       fprintf(stderr, Name ": %s misses out due to wrong homehost\n",
+                                                               devname);
+                                               goto loop;
+                                       } else { /* reject all those sofar */
+                                               mddev_dev_t td;
+                                               if ((inargv && verbose >= 0) || verbose > 0)
+                                                       fprintf(stderr, Name ": %s overrides previous devices due to good homehost\n",
+                                                               devname);
+                                               for (td=devlist; td != tmpdev; td=td->next)
+                                                       if (td->used == 1)
+                                                               td->used = 0;
+                                               tmpdev->used = 1;
+                                               goto loop;
+                                       }
+                               }
+                       }
                        fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
                                devname);
-                       free(super);
-                       free(first_super);
+                       tst->ss->free_super(tst, super);
+                       st->ss->free_super(st, first_super);
                        return 1;
                }
 
+               tmpdev->used = 1;
+
+       loop:
+               if (super)
+                       tst->ss->free_super(tst, super);
+               super = NULL;
+       }
+
+       if (mdfd < 0) {
+               /* So... it is up to me to open the device.
+                * We create a name '/dev/md/XXX' based on the info in the
+                * superblock, and call open_mddev on that
+                */
+               mdu_array_info_t inf;
+               char *c;
+               if (!first_super) {
+                       return 2;
+               }
+               st->ss->getinfo_super(st, &info, first_super);
+               c = strchr(info.name, ':');
+               if (c) c++; else c= info.name;
+               if (isdigit(*c) && ((ident->autof & 7)==4 || (ident->autof&7)==6))
+                       /* /dev/md/d0 style for partitionable */
+                       asprintf(&mddev, "/dev/md/d%s", c);
+               else
+                       asprintf(&mddev, "/dev/md/%s", c);
+               mdfd = open_mddev(mddev, ident->autof);
+               if (mdfd < 0) {
+                       st->ss->free_super(st, first_super);
+                       free(devices);
+                       first_super = NULL;
+                       goto try_again;
+               }
+               vers = md_get_version(mdfd);
+               if (ioctl(mdfd, GET_ARRAY_INFO, &inf)==0) {
+                       for (tmpdev = devlist ;
+                            tmpdev && tmpdev->used != 1;
+                            tmpdev = tmpdev->next)
+                               ;
+                       fprintf(stderr, Name ": %s already active, cannot restart it!\n", mddev);
+                       if (tmpdev)
+                               fprintf(stderr, Name ":   %s needed for %s...\n",
+                                       mddev, tmpdev->devname);
+                       close(mdfd);
+                       mdfd = -1;
+                       st->ss->free_super(st, first_super);
+                       free(devices);
+                       first_super = NULL;
+                       goto try_again;
+               }
+               must_close = 1;
+       }
+
+       /* Ok, no bad inconsistancy, we can try updating etc */
+       bitmap_done = 0;
+       for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) if (tmpdev->used == 1) {
+               char *devname = tmpdev->devname;
+               struct stat stb;
                /* looks like a good enough match to update the super block if needed */
+#ifndef MDASSEMBLE
                if (update) {
+                       int dfd;
                        /* prepare useful information in info structures */
                        struct stat stb2;
                        fstat(mdfd, &stb2);
+
+                       if (strcmp(update, "uuid")==0 &&
+                           !ident->uuid_set) {
+                               int rfd;
+                               if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
+                                   read(rfd, ident->uuid, 16) != 16) {
+                                       *(__u32*)(ident->uuid) = random();
+                                       *(__u32*)(ident->uuid+1) = random();
+                                       *(__u32*)(ident->uuid+2) = random();
+                                       *(__u32*)(ident->uuid+3) = random();
+                               }
+                               if (rfd >= 0) close(rfd);
+                       }
+                       dfd = dev_open(devname, O_RDWR|O_EXCL);
+
+                       remove_partitions(dfd);
+
+                       st->ss->load_super(st, dfd, &super, NULL);
+                       st->ss->getinfo_super(st, &info, super);
+
+                       memcpy(info.uuid, ident->uuid, 16);
+                       strcpy(info.name, ident->name);
                        info.array.md_minor = minor(stb2.st_rdev);
-                       
-                       update_super0(&info, super, update, devname, verbose);
-                       
-                       dfd = open(devname, O_RDWR|O_EXCL, 0);
-                       if (dfd < 0) 
+
+                       st->ss->update_super(st, &info, super, update,
+                                            devname, verbose,
+                                            ident->uuid_set, homehost);
+                       if (strcmp(update, "uuid")==0 &&
+                           !ident->uuid_set) {
+                               ident->uuid_set = 1;
+                               memcpy(ident->uuid, info.uuid, 16);
+                       }
+                       if (dfd < 0)
                                fprintf(stderr, Name ": Cannot open %s for superblock update\n",
                                        devname);
-                       else if (store_super0(dfd, super))
+                       else if (st->ss->store_super(st, dfd, super))
                                fprintf(stderr, Name ": Could not re-write superblock on %s.\n",
                                        devname);
                        if (dfd >= 0)
                                close(dfd);
+
+                       if (strcmp(update, "uuid")==0 &&
+                           ident->bitmap_fd >= 0 && !bitmap_done) {
+                               if (bitmap_update_uuid(ident->bitmap_fd, info.uuid, st->ss->swapuuid) != 0)
+                                       fprintf(stderr, Name ": Could not update uuid on external bitmap.\n");
+                               else
+                                       bitmap_done = 1;
+                       }
+               } else
+#endif
+               {
+                       int dfd;
+                       dfd = dev_open(devname, O_RDWR|O_EXCL);
+
+                       remove_partitions(dfd);
+
+                       st->ss->load_super(st, dfd, &super, NULL);
+                       st->ss->getinfo_super(st, &info, super);
+                       close(dfd);
                }
 
-               if (verbose)
+               stat(devname, &stb);
+
+               if (verbose > 0)
                        fprintf(stderr, Name ": %s is identified as a member of %s, slot %d.\n",
                                devname, mddev, info.disk.raid_disk);
                devices[devcnt].devname = devname;
@@ -291,6 +500,7 @@ int Assemble(char *mddev, int mdfd,
                devices[devcnt].oldminor = info.disk.minor;
                devices[devcnt].events = info.events;
                devices[devcnt].raid_disk = info.disk.raid_disk;
+               devices[devcnt].disk_nr = info.disk.number;
                devices[devcnt].uptodate = 0;
                devices[devcnt].state = info.disk.state;
                if (most_recent < devcnt) {
@@ -298,11 +508,20 @@ int Assemble(char *mddev, int mdfd,
                            > devices[most_recent].events)
                                most_recent = devcnt;
                }
-               if (info.array.level == -4) 
+               if (info.array.level == -4)
                        /* with multipath, the raid_disk from the superblock is meaningless */
                        i = devcnt;
                else
                        i = devices[devcnt].raid_disk;
+               if (i+1 == 0) {
+                       if (nextspare < info.array.raid_disks)
+                               nextspare = info.array.raid_disks;
+                       i = nextspare++;
+               } else {
+                       if (i >= info.array.raid_disks &&
+                           i >= nextspare)
+                               nextspare = i+1;
+               }
                if (i < 10000) {
                        if (i >= bestcnt) {
                                unsigned int newbestcnt = i+10;
@@ -317,34 +536,65 @@ int Assemble(char *mddev, int mdfd,
                                best = newbest;
                                bestcnt = newbestcnt;
                        }
+                       if (best[i] >=0 &&
+                           devices[best[i]].events == devices[devcnt].events &&
+                           devices[best[i]].minor != devices[devcnt].minor &&
+                           st->ss->major == 0 &&
+                           info.array.level != -4) {
+                               /* two different devices with identical superblock.
+                                * Could be a mis-detection caused by overlapping
+                                * partitions.  fail-safe.
+                                */
+                               fprintf(stderr, Name ": 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"
+                                       );
+                               if (must_close) close(mdfd);
+                               return 1;
+                       }
                        if (best[i] == -1
                            || devices[best[i]].events < devices[devcnt].events)
                                best[i] = devcnt;
                }
                devcnt++;
+
+               if (super)
+                       st->ss->free_super(st, super);
+               super = NULL;
        }
 
-       if (super)
-               free(super);
-       super = NULL;
+       if (update && strcmp(update, "byteorder")==0)
+               st->minor_version = 90;
 
        if (devcnt == 0) {
                fprintf(stderr, Name ": no devices found for %s\n",
                        mddev);
-               free(first_super);
+               st->ss->free_super(st, first_super);
+               if (must_close) close(mdfd);
                return 1;
        }
 
-       getinfo_super0(&info, first_super);
+       st->ss->getinfo_super(st, &info, first_super);
+       clean = info.array.state & 1;
 
        /* now we have some devices that might be suitable.
         * I wonder how many
         */
+       avail = malloc(info.array.raid_disks);
+       memset(avail, 0, info.array.raid_disks);
        okcnt = 0;
        sparecnt=0;
        for (i=0; i< bestcnt ;i++) {
                int j = best[i];
-               int event_margin = !force;
+               int event_margin = 1; /* always allow a difference of '1'
+                                      * like the kernel does
+                                      */
                if (j < 0) continue;
                /* note: we ignore error flags in multipath arrays
                 * as they don't make sense
@@ -358,18 +608,22 @@ int Assemble(char *mddev, int mdfd,
                if (devices[j].events+event_margin >=
                    devices[most_recent].events) {
                        devices[j].uptodate = 1;
-                       if (i < info.array.raid_disks)
+                       if (i < info.array.raid_disks) {
                                okcnt++;
-                       else
+                               avail[i]=1;
+                       } else
                                sparecnt++;
                }
        }
-       while (force && !enough(info.array.level, info.array.raid_disks, okcnt)) {
+       while (force && !enough(info.array.level, info.array.raid_disks,
+                               info.array.layout, 1,
+                               avail, okcnt)) {
                /* Choose the newest best drive which is
                 * not up-to-date, update the superblock
                 * and add it.
                 */
                int fd;
+               long long current_events;
                chosen_drive = -1;
                for (i=0; i<info.array.raid_disks && i < bestcnt; i++) {
                        int j = best[i];
@@ -382,18 +636,21 @@ int Assemble(char *mddev, int mdfd,
                }
                if (chosen_drive < 0)
                        break;
-               fprintf(stderr, Name ": forcing event count in %s(%d) from %d upto %d\n",
-                       devices[chosen_drive].devname, devices[chosen_drive].raid_disk,
-                       (int)(devices[chosen_drive].events),
-                       (int)(devices[most_recent].events));
-               fd = open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
+               current_events = devices[chosen_drive].events;
+       add_another:
+               if (verbose >= 0)
+                       fprintf(stderr, Name ": forcing event count in %s(%d) from %d upto %d\n",
+                               devices[chosen_drive].devname, devices[chosen_drive].raid_disk,
+                               (int)(devices[chosen_drive].events),
+                               (int)(devices[most_recent].events));
+               fd = dev_open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
                if (fd < 0) {
                        fprintf(stderr, Name ": Couldn't open %s for write - not updating\n",
                                devices[chosen_drive].devname);
                        devices[chosen_drive].events = 0;
                        continue;
                }
-               if (load_super0(fd, &super, NULL)) {
+               if (st->ss->load_super(st,fd, &super, NULL)) {
                        close(fd);
                        fprintf(stderr, Name ": RAID superblock disappeared from %s - not updating.\n",
                                devices[chosen_drive].devname);
@@ -401,21 +658,38 @@ int Assemble(char *mddev, int mdfd,
                        continue;
                }
                info.events = devices[most_recent].events;
-               update_super0(&info, super, "force", devices[chosen_drive].devname, verbose);
+               st->ss->update_super(st, &info, super, "force-one",
+                                    devices[chosen_drive].devname, verbose,
+                                    0, NULL);
 
-               if (store_super0(fd, super)) {
+               if (st->ss->store_super(st, fd, super)) {
                        close(fd);
                        fprintf(stderr, Name ": Could not re-write superblock on %s\n",
                                devices[chosen_drive].devname);
                        devices[chosen_drive].events = 0;
-                       free(super);
+                       st->ss->free_super(st, super);
                        continue;
                }
                close(fd);
                devices[chosen_drive].events = devices[most_recent].events;
                devices[chosen_drive].uptodate = 1;
+               avail[chosen_drive] = 1;
                okcnt++;
-               free(super);
+               st->ss->free_super(st, super);
+
+               /* 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<info.array.raid_disks && i < bestcnt ; i++) {
+                       int j = best[i];
+                       if (j >= 0 &&
+                           !devices[j].uptodate &&
+                           devices[j].events > 0 &&
+                           devices[j].events == current_events) {
+                               chosen_drive = j;
+                               goto add_another;
+                       }
+               }
        }
 
        /* Now we want to look at the superblock which the kernel will base things on
@@ -435,24 +709,27 @@ int Assemble(char *mddev, int mdfd,
                if (!devices[j].uptodate)
                        continue;
                chosen_drive = j;
-               if ((fd=open(devices[j].devname, O_RDONLY|O_EXCL))< 0) {
+               if ((fd=dev_open(devices[j].devname, O_RDONLY|O_EXCL))< 0) {
                        fprintf(stderr, Name ": Cannot open %s: %s\n",
                                devices[j].devname, strerror(errno));
+                       if (must_close) close(mdfd);
                        return 1;
                }
-               if (load_super0(fd, &super, NULL)) {
+               if (st->ss->load_super(st,fd, &super, NULL)) {
                        close(fd);
                        fprintf(stderr, Name ": RAID superblock has disappeared from %s\n",
                                devices[j].devname);
+                       if (must_close) close(mdfd);
                        return 1;
                }
                close(fd);
        }
        if (super == NULL) {
                fprintf(stderr, Name ": No suitable drives found for %s\n", mddev);
+               if (must_close) close(mdfd);
                return 1;
        }
-       getinfo_super0(&info, super);
+       st->ss->getinfo_super(st, &info, super);
        for (i=0; i<bestcnt; i++) {
                int j = best[i];
                unsigned int desired_state;
@@ -466,20 +743,24 @@ int Assemble(char *mddev, int mdfd,
                        continue;
                if (!devices[j].uptodate)
                        continue;
-               info.disk.number = i;
+               info.disk.number = devices[j].disk_nr;
+               info.disk.raid_disk = i;
                info.disk.state = desired_state;
 
                if (devices[j].uptodate &&
-                   update_super0(&info, super, "assemble", NULL, 0)) {
+                   st->ss->update_super(st, &info, super, "assemble", NULL,
+                                        verbose, 0, NULL)) {
                        if (force) {
-                               fprintf(stderr, Name ": "
-                                       "clearing FAULTY flag for device %d in %s for %s\n",
-                                       j, mddev, devices[j].devname);
+                               if (verbose >= 0)
+                                       fprintf(stderr, Name ": "
+                                               "clearing FAULTY flag for device %d in %s for %s\n",
+                                               j, mddev, devices[j].devname);
                                change = 1;
                        } else {
-                               fprintf(stderr, Name ": "
-                                       "device %d in %s has wrong state in superblock, but %s seems ok\n",
-                                       i, mddev, devices[j].devname);
+                               if (verbose >= -1)
+                                       fprintf(stderr, Name ": "
+                                               "device %d in %s has wrong state in superblock, but %s seems ok\n",
+                                               i, mddev, devices[j].devname);
                        }
                }
 #if 0
@@ -490,29 +771,69 @@ int Assemble(char *mddev, int mdfd,
                }
 #endif
        }
-       if (force && okcnt == info.array.raid_disks-1) {
-               /* FIXME check event count */
-               change += update_super0(&info, super, "force", 
-                                       devices[chosen_drive].devname, 0);
+       if (force && !clean &&
+           !enough(info.array.level, info.array.raid_disks,
+                   info.array.layout, clean,
+                   avail, okcnt)) {
+               change += st->ss->update_super(st, &info, super, "force-array",
+                                       devices[chosen_drive].devname, verbose,
+                                              0, NULL);
+               clean = 1;
        }
 
        if (change) {
                int fd;
-               fd = open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
+               fd = dev_open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
                if (fd < 0) {
-                       fprintf(stderr, Name ": Could open %s for write - cannot Assemble array.\n",
+                       fprintf(stderr, Name ": Could not open %s for write - cannot Assemble array.\n",
                                devices[chosen_drive].devname);
+                       if (must_close) close(mdfd);
                        return 1;
                }
-               if (store_super0(fd, super)) {
+               if (st->ss->store_super(st, fd, super)) {
                        close(fd);
                        fprintf(stderr, Name ": Could not re-write superblock on %s\n",
                                devices[chosen_drive].devname);
+                       if (must_close) close(mdfd);
                        return 1;
                }
                close(fd);
        }
 
+       /* If we are in the middle of a reshape we may need to restore saved data
+        * that was moved aside due to the reshape overwriting live data
+        * The code of doing this lives in Grow.c
+        */
+#ifndef MDASSEMBLE
+       if (info.reshape_active) {
+               int err = 0;
+               int *fdlist = malloc(sizeof(int)* bestcnt);
+               for (i=0; i<bestcnt; i++) {
+                       int j = best[i];
+                       if (j >= 0) {
+                               fdlist[i] = dev_open(devices[j].devname, O_RDWR|O_EXCL);
+                               if (fdlist[i] < 0) {
+                                       fprintf(stderr, Name ": Could not open %s for write - cannot Assemble array.\n",
+                                               devices[j].devname);
+                                       err = 1;
+                                       break;
+                               }
+                       } else
+                               fdlist[i] = -1;
+               }
+               if (!err)
+                       err = Grow_restart(st, &info, fdlist, bestcnt, backup_file);
+               while (i>0) {
+                       i--;
+                       if (fdlist[i]>=0) close(fdlist[i]);
+               }
+               if (err) {
+                       fprintf(stderr, Name ": Failed to restore critical section for reshape, sorry.\n");
+                       if (must_close) close(mdfd);
+                       return err;
+               }
+       }
+#endif
        /* count number of in-sync devices according to the superblock.
         * We must have this number to start the array without -s or -R
         */
@@ -520,11 +841,46 @@ int Assemble(char *mddev, int mdfd,
 
        /* Almost ready to actually *do* something */
        if (!old_linux) {
-               if (ioctl(mdfd, SET_ARRAY_INFO, NULL) != 0) {
+               int rv;
+               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;
+                       rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
+               } else
+                       rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
+
+               if (rv) {
                        fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
                                mddev, strerror(errno));
+                       if (must_close) close(mdfd);
                        return 1;
                }
+               if (ident->bitmap_fd >= 0) {
+                       if (ioctl(mdfd, SET_BITMAP_FILE, ident->bitmap_fd) != 0) {
+                               fprintf(stderr, Name ": SET_BITMAP_FILE failed.\n");
+                               if (must_close) close(mdfd);
+                               return 1;
+                       }
+               } else if (ident->bitmap_file) {
+                       /* From config file */
+                       int bmfd = open(ident->bitmap_file, O_RDWR);
+                       if (bmfd < 0) {
+                               fprintf(stderr, Name ": Could not open bitmap file %s\n",
+                                       ident->bitmap_file);
+                               if (must_close) close(mdfd);
+                               return 1;
+                       }
+                       if (ioctl(mdfd, SET_BITMAP_FILE, bmfd) != 0) {
+                               fprintf(stderr, Name ": Failed to set bitmapfile for %s\n", mddev);
+                               close(bmfd);
+                               if (must_close) close(mdfd);
+                               return 1;
+                       }
+                       close(bmfd);
+               }
+
                /* First, add the raid disks, but add the chosen one last */
                for (i=0; i<= bestcnt; i++) {
                        int j;
@@ -549,50 +905,108 @@ int Assemble(char *mddev, int mdfd,
                                                okcnt--;
                                        else
                                                sparecnt--;
-                               } else if (verbose)
+                               } else if (verbose > 0)
                                        fprintf(stderr, Name ": added %s to %s as %d\n",
                                                devices[j].devname, mddev, devices[j].raid_disk);
-                       } else if (verbose && i < info.array.raid_disks)
+                       } else if (verbose > 0 && i < info.array.raid_disks)
                                fprintf(stderr, Name ": no uptodate device for slot %d of %s\n",
                                        i, mddev);
                }
-               
+
                if (runstop == 1 ||
-                   (runstop == 0 && 
-                    ( enough(info.array.level, info.array.raid_disks, okcnt) &&
+                   (runstop <= 0 &&
+                    ( enough(info.array.level, info.array.raid_disks,
+                             info.array.layout, clean, avail, okcnt) &&
                       (okcnt >= req_cnt || start_partial_ok)
                             ))) {
                        if (ioctl(mdfd, RUN_ARRAY, NULL)==0) {
-                               fprintf(stderr, Name ": %s has been started with %d drive%s",
-                                       mddev, okcnt, okcnt==1?"":"s");
-                               if (okcnt < info.array.raid_disks) 
-                                       fprintf(stderr, " (out of %d)", info.array.raid_disks);
-                               if (sparecnt)
-                                       fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
-                               fprintf(stderr, ".\n");
+                               if (verbose >= 0) {
+                                       fprintf(stderr, Name ": %s has been started with %d drive%s",
+                                               mddev, okcnt, okcnt==1?"":"s");
+                                       if (okcnt < info.array.raid_disks)
+                                               fprintf(stderr, " (out of %d)", info.array.raid_disks);
+                                       if (sparecnt)
+                                               fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
+                                       fprintf(stderr, ".\n");
+                               }
+                               if (must_close) {
+                                       int usecs = 1;
+                                       close(mdfd);
+                                       /* There is a nasty race with 'mdadm --monitor'.
+                                        * If it opens this device before we close it,
+                                        * it gets an incomplete open on which IO
+                                        * doesn't work and the capacity if wrong.
+                                        * If we reopen (to check for layered devices)
+                                        * before --monitor closes, we loose.
+                                        *
+                                        * So: wait upto 1 second for there to be
+                                        * a non-zero capacity.
+                                        */
+                                       while (usecs < 1000) {
+                                               mdfd = open(mddev, O_RDONLY);
+                                               if (mdfd >= 0) {
+                                                       unsigned long long size;
+                                                       if (get_dev_size(mdfd, NULL, &size) &&
+                                                           size > 0)
+                                                               break;
+                                                       close(mdfd);
+                                               }
+                                               usleep(usecs);
+                                               usecs <<= 1;
+                                       }
+                               }
                                return 0;
                        }
                        fprintf(stderr, Name ": failed to RUN_ARRAY %s: %s\n",
                                mddev, strerror(errno));
+
+                       if (!enough(info.array.level, info.array.raid_disks,
+                                   info.array.layout, 1, avail, okcnt))
+                               fprintf(stderr, Name ": Not enough devices to "
+                                       "start the array.\n");
+                       else if (!enough(info.array.level,
+                                        info.array.raid_disks,
+                                        info.array.layout, clean,
+                                        avail, okcnt))
+                               fprintf(stderr, Name ": Not enough devices to "
+                                       "start the array while not clean "
+                                       "- consider --force.\n");
+
+                       if (must_close) close(mdfd);
                        return 1;
                }
                if (runstop == -1) {
-                       fprintf(stderr, Name ": %s assembled from %d drive%s, but not started.\n",
+                       fprintf(stderr, Name ": %s assembled from %d drive%s",
                                mddev, okcnt, okcnt==1?"":"s");
+                       if (okcnt != info.array.raid_disks)
+                               fprintf(stderr, " (out of %d)", info.array.raid_disks);
+                       fprintf(stderr, ", but not started.\n");
+                       if (must_close) close(mdfd);
                        return 0;
                }
-               fprintf(stderr, Name ": %s assembled from %d drive%s", mddev, okcnt, okcnt==1?"":"s");
-               if (sparecnt)
-                       fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
-               if (!enough(info.array.level, info.array.raid_disks, okcnt))
-                       fprintf(stderr, " - not enough to start the array.\n");
-               else {
-                       if (req_cnt == info.array.raid_disks)
-                               fprintf(stderr, " - need all %d to start it", req_cnt);
-                       else
-                               fprintf(stderr, " - need %d of %d to start", req_cnt, info.array.raid_disks);
-                       fprintf(stderr, " (use --run to insist).\n");
+               if (verbose >= -1) {
+                       fprintf(stderr, Name ": %s assembled from %d drive%s", mddev, okcnt, okcnt==1?"":"s");
+                       if (sparecnt)
+                               fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
+                       if (!enough(info.array.level, info.array.raid_disks,
+                                   info.array.layout, 1, avail, okcnt))
+                               fprintf(stderr, " - not enough to start the array.\n");
+                       else if (!enough(info.array.level,
+                                        info.array.raid_disks,
+                                        info.array.layout, clean,
+                                        avail, okcnt))
+                               fprintf(stderr, " - not enough to start the "
+                                       "array while not clean - consider "
+                                       "--force.\n");
+                       else {
+                               if (req_cnt == info.array.raid_disks)
+                                       fprintf(stderr, " - need all %d to start it", req_cnt);
+                               else
+                                       fprintf(stderr, " - need %d of %d to start", req_cnt, info.array.raid_disks);
+                               fprintf(stderr, " (use --run to insist).\n");
+                       }
                }
+               if (must_close) close(mdfd);
                return 1;
        } else {
                /* The "chosen_drive" is a good choice, and if necessary, the superblock has
@@ -606,7 +1020,8 @@ int Assemble(char *mddev, int mdfd,
                    fprintf(stderr, Name ": Cannot start array: %s\n",
                            strerror(errno));
                }
-               
+
        }
+       if (must_close) close(mdfd);
        return 0;
 }