array_try_spare(): missing map_unlock()

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 66d2ee42c369be172764fe75c09d863e7401d457..2000dd073c3a560b74b349b50013ee4536581da6 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -138,7 +138,7 @@ int Assemble(struct supertype *st, char *mddev,
             char *backup_file, int invalid_backup,
             int readonly, int runstop,
             char *update, char *homehost, int require_homehost,
-            int verbose, int force)
+            int verbose, int force, int freeze_reshape)
 {
        /*
         * The task of Assemble is to find a collection of
@@ -697,7 +697,7 @@ int Assemble(struct supertype *st, char *mddev,
                int err;
                err = assemble_container_content(st, mdfd, content, runstop,
                                                 chosen_name, verbose,
-                                                backup_file);
+                                                backup_file, freeze_reshape);
                close(mdfd);
                return err;
        }
@@ -1343,9 +1343,14 @@ int Assemble(struct supertype *st, char *mddev,
                        int rv;
 #ifndef MDASSEMBLE
                        if (content->reshape_active &&
-                           content->delta_disks <= 0)
-                               rv = Grow_continue(mdfd, st, content, backup_file);
-                       else
+                           content->delta_disks <= 0) {
+                               rv = sysfs_set_str(content, NULL,
+                                                  "array_state", "readonly");
+                               if (rv == 0)
+                                       rv = Grow_continue(mdfd, st, content,
+                                                          backup_file,
+                                                          freeze_reshape);
+                       } else
 #endif
                                rv = ioctl(mdfd, RUN_ARRAY, NULL);
                        if (rv == 0) {
@@ -1511,7 +1516,7 @@ int Assemble(struct supertype *st, char *mddev,
 int assemble_container_content(struct supertype *st, int mdfd,
                               struct mdinfo *content, int runstop,
                               char *chosen_name, int verbose,
-                              char *backup_file)
+                              char *backup_file, int freeze_reshape)
 {
        struct mdinfo *dev, *sra;
        int working = 0, preexist = 0;
@@ -1526,7 +1531,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
                if (sysfs_set_array(content, md_get_version(mdfd)) != 0)
                        return 1;
 
-       if (content->reshape_active)
+       if (st->ss->external && content->recovery_blocked)
                block_subarray(content);
 
        if (sra)
@@ -1555,46 +1560,24 @@ int assemble_container_content(struct supertype *st, int mdfd,
 
                if (content->reshape_active) {
                        int spare = content->array.raid_disks + expansion;
-                       int i;
-                       int *fdlist = malloc(sizeof(int) *
-                                            (working + expansion
-                                             + content->array.raid_disks));
-                       for (i=0; i<spare; i++)
-                               fdlist[i] = -1;
-                       for (dev = content->devs; dev; dev = dev->next) {
-                               char buf[20];
-                               int fd;
-                               sprintf(buf, "%d:%d",
-                                       dev->disk.major,
-                                       dev->disk.minor);
-                               fd = dev_open(buf, O_RDWR);
-
-                               if (dev->disk.raid_disk >= 0)
-                                       fdlist[dev->disk.raid_disk] = fd;
-                               else
-                                       fdlist[spare++] = fd;
-                       }
-                       if (st->ss->external && st->ss->recover_backup)
-                               err = st->ss->recover_backup(st, content);
-                       else
-                               err = Grow_restart(st, content, fdlist, spare,
-                                                  backup_file, verbose > 0);
-                       while (spare > 0) {
-                               spare--;
-                               if (fdlist[spare] >= 0)
-                                       close(fdlist[spare]);
-                       }
-                       free(fdlist);
-                       if (err) {
-                               fprintf(stderr, Name ": Failed to restore critical"
-                                       " section for reshape - sorry.\n");
-                               if (!backup_file)
-                                       fprintf(stderr, Name ":  Possibly you need"
-                                               " to specify a --backup-file\n");
+                       if (restore_backup(st, content,
+                                          working,
+                                          spare, backup_file, 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_dev))
+                                       start_mdmon(st->container_dev);
+                               ping_monitor_by_id(st->container_dev);
                        }
 
-                       err = Grow_continue(mdfd, st, content, backup_file);
+                       err = Grow_continue(mdfd, st, content, backup_file,
+                                           freeze_reshape);
                } else switch(content->array.level) {
                case LEVEL_LINEAR:
                case LEVEL_MULTIPATH: