Remove avail_disks arg from 'enough'.

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index ac1115de1adcda6fd10e15289abd136b361c2deb..972398e5513cfde4d52b4c4f7e0dd4f364bd76a5 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -220,7 +220,9 @@ int Assemble(struct supertype *st, char *mddev,
        int change = 0;
        int inargv = 0;
        int report_missmatch;
+#ifndef MDASSEMBLE
        int bitmap_done;
+#endif
        int start_partial_ok = (runstop >= 0) && 
                (force || devlist==NULL || auto_assem);
        unsigned int num_devs;
@@ -293,7 +295,7 @@ int Assemble(struct supertype *st, char *mddev,
                char *devname = tmpdev->devname;
                int dfd;
                struct stat stb;
-               struct supertype *tst = dup_super(st);
+               struct supertype *tst;
                struct dev_policy *pol = NULL;
                int found_container = 0;
 
@@ -306,6 +308,8 @@ int Assemble(struct supertype *st, char *mddev,
                        continue;
                }
 
+               tst = dup_super(st);
+
                dfd = dev_open(devname, O_RDONLY|O_EXCL);
                if (dfd < 0) {
                        if (report_missmatch)
@@ -699,10 +703,9 @@ int Assemble(struct supertype *st, char *mddev,
                close(mdfd);
                return err;
        }
+       bitmap_done = 0;
 #endif
        /* Ok, no bad inconsistancy, we can try updating etc */
-       bitmap_done = 0;
-       content->update_private = NULL;
        devices = malloc(num_devs * sizeof(*devices));
        devmap = calloc(num_devs * content->array.raid_disks, 1);
        for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) if (tmpdev->used == 1) {
@@ -887,8 +890,6 @@ int Assemble(struct supertype *st, char *mddev,
                }
                devcnt++;
        }
-       free(content->update_private);
-       content->update_private = NULL;
 
        if (devcnt == 0) {
                fprintf(stderr, Name ": no devices found for %s\n",
@@ -933,7 +934,7 @@ int Assemble(struct supertype *st, char *mddev,
                                }
                                continue;
                        }
-               /* If this devices thinks that 'most_recent' has failed, then
+               /* If this device thinks that 'most_recent' has failed, then
                 * we must reject this device.
                 */
                if (j != most_recent &&
@@ -964,7 +965,7 @@ int Assemble(struct supertype *st, char *mddev,
        free(devmap);
        while (force && !enough(content->array.level, content->array.raid_disks,
                                content->array.layout, 1,
-                               avail, okcnt)) {
+                               avail)) {
                /* Choose the newest best drive which is
                 * not up-to-date, update the superblock
                 * and add it.
@@ -1131,7 +1132,7 @@ int Assemble(struct supertype *st, char *mddev,
        if (force && !clean &&
            !enough(content->array.level, content->array.raid_disks,
                    content->array.layout, clean,
-                   avail, okcnt)) {
+                   avail)) {
                change += st->ss->update_super(st, content, "force-array",
                                        devices[chosen_drive].devname, verbose,
                                               0, NULL);
@@ -1330,7 +1331,7 @@ int Assemble(struct supertype *st, char *mddev,
                if (runstop == 1 ||
                    (runstop <= 0 &&
                     ( enough(content->array.level, content->array.raid_disks,
-                             content->array.layout, clean, avail, okcnt) &&
+                             content->array.layout, clean, avail) &&
                       (okcnt + rebuilding_cnt >= req_cnt || start_partial_ok)
                             ))) {
                        /* This array is good-to-go.
@@ -1375,6 +1376,7 @@ int Assemble(struct supertype *st, char *mddev,
                                                        sysfs_set_num(sra, NULL,
                                                                      "stripe_cache_size",
                                                                      (4 * content->array.chunk_size / 4096) + 1);
+                                               sysfs_free(sra);
                                        }
                                }
                                if (okcnt < (unsigned)content->array.raid_disks) {
@@ -1435,13 +1437,13 @@ int Assemble(struct supertype *st, char *mddev,
                                mddev, strerror(errno));
 
                        if (!enough(content->array.level, content->array.raid_disks,
-                                   content->array.layout, 1, avail, okcnt))
+                                   content->array.layout, 1, avail))
                                fprintf(stderr, Name ": Not enough devices to "
                                        "start the array.\n");
                        else if (!enough(content->array.level,
                                         content->array.raid_disks,
                                         content->array.layout, clean,
-                                        avail, okcnt))
+                                        avail))
                                fprintf(stderr, Name ": Not enough devices to "
                                        "start the array while not clean "
                                        "- consider --force.\n");
@@ -1469,12 +1471,12 @@ int Assemble(struct supertype *st, char *mddev,
                        if (sparecnt)
                                fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
                        if (!enough(content->array.level, content->array.raid_disks,
-                                   content->array.layout, 1, avail, okcnt))
+                                   content->array.layout, 1, avail))
                                fprintf(stderr, " - not enough to start the array.\n");
                        else if (!enough(content->array.level,
                                         content->array.raid_disks,
                                         content->array.layout, clean,
-                                        avail, okcnt))
+                                        avail))
                                fprintf(stderr, " - not enough to start the "
                                        "array while not clean - consider "
                                        "--force.\n");
@@ -1526,8 +1528,11 @@ int assemble_container_content(struct supertype *st, int mdfd,
 
        sra = sysfs_read(mdfd, 0, GET_VERSION);
        if (sra == NULL || strcmp(sra->text_version, content->text_version) != 0)
-               if (sysfs_set_array(content, md_get_version(mdfd)) != 0)
+               if (sysfs_set_array(content, md_get_version(mdfd)) != 0) {
+                       if (sra)
+                               sysfs_free(sra);
                        return 1;
+               }
 
        if (st->ss->external && content->recovery_blocked)
                block_subarray(content);
@@ -1579,6 +1584,9 @@ int assemble_container_content(struct supertype *st, int mdfd,
                                if (!mdmon_running(st->container_dev))
                                        start_mdmon(st->container_dev);
                                ping_monitor_by_id(st->container_dev);
+                               if (mdmon_running(st->container_dev) &&
+                                               st->update_tail == NULL)
+                                       st->update_tail = &st->updates;
                        }
 
                        err = Grow_continue(mdfd, st, content, backup_file,
@@ -1606,12 +1614,14 @@ int assemble_container_content(struct supertype *st, int mdfd,
                if (verbose >= 0) {
                        if (err)
                                fprintf(stderr, Name
-                                       ": array %s now has %d devices",
-                                       chosen_name, working + preexist);
+                                       ": array %s now has %d device%s",
+                                       chosen_name, working + preexist,
+                                       working + preexist == 1 ? "":"s");
                        else
                                fprintf(stderr, Name
-                                       ": Started %s with %d devices",
-                                       chosen_name, working + preexist);
+                                       ": Started %s with %d device%s",
+                                       chosen_name, working + preexist,
+                                       working + preexist == 1 ? "":"s");
                        if (preexist)
                                fprintf(stderr, " (%d new)", working);
                        if (expansion)
@@ -1624,11 +1634,15 @@ int assemble_container_content(struct supertype *st, int mdfd,
                return err;
                /* FIXME should have an O_EXCL and wait for read-auto */
        } else {
-               if (verbose >= 0)
+               if (verbose >= 0) {
                        fprintf(stderr, Name
-                               ": %s assembled with %d devices but "
-                               "not started\n",
-                               chosen_name, working);
+                               ": %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");
+               }
                return 1;
        }
 }