]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - Manage.c
Remove scattered checks for malloc success.
[thirdparty/mdadm.git] / Manage.c
index 2d8c9165ce0aae4c4f3ff0dbe9d4672e5a5224b2..6ffa78c987ee7848fd21c0320383d7d30e7c64c6 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -44,9 +44,10 @@ int Manage_ro(char *devname, int fd, int readonly)
 #ifndef MDASSEMBLE
        struct mdinfo *mdi;
 #endif
+       int rv = 0;
 
        if (md_get_version(fd) < 9000) {
-               fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
+               pr_err("need md driver version 0.90.0 or later\n");
                return 1;
        }
 #ifndef MDASSEMBLE
@@ -70,12 +71,13 @@ int Manage_ro(char *devname, int fd, int readonly)
                        rv = sysfs_set_str(mdi, NULL, "array_state", "readonly");
 
                        if (rv < 0) {
-                               fprintf(stderr, Name ": failed to set readonly for %s: %s\n",
+                               pr_err("failed to set readonly for %s: %s\n",
                                        devname, strerror(errno));
 
                                vers[9] = mdi->text_version[0];
                                sysfs_set_str(mdi, NULL, "metadata_version", vers);
-                               return 1;
+                               rv = 1;
+                               goto out;
                        }
                } else {
                        char *cp;
@@ -84,35 +86,43 @@ int Manage_ro(char *devname, int fd, int readonly)
                        sysfs_set_str(mdi, NULL, "metadata_version", vers);
 
                        cp = strchr(vers+10, '/');
-                       if (*cp)
+                       if (cp)
                                *cp = 0;
                        ping_monitor(vers+10);
                        if (mdi->array.level <= 0)
                                sysfs_set_str(mdi, NULL, "array_state", "active");
                }
-               return 0;
+               goto out;
        }
 #endif
        if (ioctl(fd, GET_ARRAY_INFO, &array)) {
-               fprintf(stderr, Name ": %s does not appear to be active.\n",
+               pr_err("%s does not appear to be active.\n",
                        devname);
-               return 1;
+               rv = 1;
+               goto out;
        }
 
        if (readonly>0) {
                if (ioctl(fd, STOP_ARRAY_RO, NULL)) {
-                       fprintf(stderr, Name ": failed to set readonly for %s: %s\n",
+                       pr_err("failed to set readonly for %s: %s\n",
                                devname, strerror(errno));
-                       return 1;
+                       rv = 1;
+                       goto out;
                }
        } else if (readonly < 0) {
                if (ioctl(fd, RESTART_ARRAY_RW, NULL)) {
-                       fprintf(stderr, Name ": failed to set writable for %s: %s\n",
+                       pr_err("failed to set writable for %s: %s\n",
                                devname, strerror(errno));
-                       return 1;
+                       rv = 1;
+                       goto out;
                }
        }
-       return 0;
+out:
+#ifndef MDASSEMBLE
+       if (mdi)
+               sysfs_free(mdi);
+#endif
+       return rv;
 }
 
 #ifndef MDASSEMBLE
@@ -142,7 +152,7 @@ static void remove_devices(int devnum, char *path)
                sprintf(base, "/dev/md_d%d", -1-devnum);
        be = base + strlen(base);
 
-       path2 = malloc(strlen(path)+20);
+       path2 = xmalloc(strlen(path)+20);
        strcpy(path2, path);
        pe = path2 + strlen(path2);
        
@@ -156,7 +166,7 @@ static void remove_devices(int devnum, char *path)
                                sprintf(pe, "%d", part);
                }
                n = readlink(path2, link, sizeof(link));
-               if (n && (int)strlen(base) == n &&
+               if (n > 0 && (int)strlen(base) == n &&
                    strncmp(link, base, n) == 0)
                        unlink(path2);
        }
@@ -173,36 +183,36 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
         * quiet < 0 means we will try again if it fails.
         */
        mdu_param_t param; /* unused */
+       int rv = 0;
 
        if (runstop == -1 && md_get_version(fd) < 9000) {
                if (ioctl(fd, STOP_MD, 0)) {
-                       if (quiet == 0) fprintf(stderr,
-                                               Name ": stopping device %s "
-                                               "failed: %s\n",
-                                               devname, strerror(errno));
+                       pr_err("stopping device %s "
+                              "failed: %s\n",
+                              devname, strerror(errno));
                        return 1;
                }
        }
 
        if (md_get_version(fd) < 9000) {
-               fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
+               pr_err("need md driver version 0.90.0 or later\n");
                return 1;
        }
        /*
        if (ioctl(fd, GET_ARRAY_INFO, &array)) {
-               fprintf(stderr, Name ": %s does not appear to be active.\n",
+               pr_err("%s does not appear to be active.\n",
                        devname);
                return 1;
        }
        */
        if (runstop>0) {
                if (ioctl(fd, RUN_ARRAY, &param)) {
-                       fprintf(stderr, Name ": failed to run array %s: %s\n",
+                       pr_err("failed to run array %s: %s\n",
                                devname, strerror(errno));
                        return 1;
                }
                if (quiet <= 0)
-                       fprintf(stderr, Name ": started %s\n", devname);
+                       pr_err("started %s\n", devname);
        } else if (runstop < 0){
                struct map_ent *map = NULL;
                struct stat stb;
@@ -222,12 +232,11 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
                if (fd < 0 || fd2devnum(fd) != devnum) {
                        if (fd >= 0)
                                close(fd);
-                       fprintf(stderr,
-                               Name ": Cannot get exclusive access to %s:"
-                               "Perhaps a running "
-                               "process, mounted filesystem "
-                               "or active volume group?\n",
-                               devname);
+                       pr_err("Cannot get exclusive access to %s:"
+                              "Perhaps a running "
+                              "process, mounted filesystem "
+                              "or active volume group?\n",
+                              devname);
                        return 1;
                }
                mdi = sysfs_read(fd, -1, GET_LEVEL|GET_VERSION);
@@ -248,10 +257,10 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
                                count--;
                        }
                        if (err && !quiet) {
-                               fprintf(stderr, Name
-                                       ": failed to stop array %s: %s\n",
-                                       devname, strerror(errno));
-                               return 1;
+                               pr_err("failed to stop array %s: %s\n",
+                                      devname, strerror(errno));
+                               rv = 1;
+                               goto out;
                        }
 
                        /* Give monitor a chance to act */
@@ -259,11 +268,11 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
 
                        fd = open_dev_excl(devnum);
                        if (fd < 0) {
-                               fprintf(stderr, Name
-                                       ": failed to completely stop %s"
-                                       ": Device is busy\n",
-                                       devname);
-                               return 1;
+                               pr_err("failed to completely stop %s"
+                                      ": Device is busy\n",
+                                      devname);
+                               rv = 1;
+                               goto out;
                        }
                } else if (mdi &&
                           mdi->array.major_version == -1 &&
@@ -286,14 +295,12 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
                                    is_subarray(m->metadata_version+9) &&
                                    devname2devnum(m->metadata_version+10) == devnum) {
                                        if (!quiet)
-                                               fprintf(stderr, Name
-                                                       ": Cannot stop container %s: "
-                                                       "member %s still active\n",
-                                                       devname, m->dev);
+                                               pr_err("Cannot stop container %s: "
+                                                      "member %s still active\n",
+                                                      devname, m->dev);
                                        free_mdstat(mds);
-                                       if (mdi)
-                                               sysfs_free(mdi);
-                                       return 1;
+                                       rv = 1;
+                                       goto out;
                                }
                }
 
@@ -310,17 +317,15 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
                }
                if (fd >= 0 && err) {
                        if (quiet == 0) {
-                               fprintf(stderr, Name
-                                       ": failed to stop array %s: %s\n",
-                                       devname, strerror(errno));
+                               pr_err("failed to stop array %s: %s\n",
+                                      devname, strerror(errno));
                                if (errno == EBUSY)
                                        fprintf(stderr, "Perhaps a running "
                                                "process, mounted filesystem "
                                                "or active volume group?\n");
                        }
-                       if (mdi)
-                               sysfs_free(mdi);
-                       return 1;
+                       rv = 1;
+                       goto out;
                }
                /* prior to 2.6.28, KOBJ_CHANGE was not sent when an md array
                 * was stopped, so We'll do it here just to be sure.  Drop any
@@ -341,19 +346,22 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
 
 
                if (quiet <= 0)
-                       fprintf(stderr, Name ": stopped %s\n", devname);
+                       pr_err("stopped %s\n", devname);
                map_lock(&map);
                map_remove(&map, devnum);
                map_unlock(&map);
+       out:
+               if (mdi)
+                       sysfs_free(mdi);
        }
-       return 0;
+       return rv;
 }
 
 int Manage_resize(char *devname, int fd, long long size, int raid_disks)
 {
        mdu_array_info_t info;
        if (ioctl(fd, GET_ARRAY_INFO, &info) != 0) {
-               fprintf(stderr, Name ": Cannot get array information for %s: %s\n",
+               pr_err("Cannot get array information for %s: %s\n",
                        devname, strerror(errno));
                return 1;
        }
@@ -362,7 +370,7 @@ int Manage_resize(char *devname, int fd, long long size, int raid_disks)
        if (raid_disks > 0)
                info.raid_disks = raid_disks;
        if (ioctl(fd, SET_ARRAY_INFO, &info) != 0) {
-               fprintf(stderr, Name ": Cannot set device size/shape for %s: %s\n",
+               pr_err("Cannot set device size/shape for %s: %s\n",
                        devname, strerror(errno));
                return 1;
        }
@@ -402,12 +410,15 @@ int Manage_subdevs(char *devname, int fd,
        int lfd = -1;
        int sysfd = -1;
        int count = 0; /* number of actions taken */
+       struct mdinfo info;
+       int frozen = 0;
 
        if (ioctl(fd, GET_ARRAY_INFO, &array)) {
-               fprintf(stderr, Name ": cannot get array info for %s\n",
+               pr_err("cannot get array info for %s\n",
                        devname);
-               return 1;
+               goto abort;
        }
+       sysfs_init(&info, fd, 0);
 
        /* array.size is only 32 bit and may be truncated.
         * So read from sysfs if possible, and record number of sectors
@@ -419,9 +430,9 @@ int Manage_subdevs(char *devname, int fd,
 
        tst = super_by_fd(fd, &subarray);
        if (!tst) {
-               fprintf(stderr, Name ": unsupport array - version %d.%d\n",
+               pr_err("unsupport array - version %d.%d\n",
                        array.major_version, array.minor_version);
-               return 1;
+               goto abort;
        }
 
        stb.st_rdev = 0;
@@ -431,7 +442,7 @@ int Manage_subdevs(char *devname, int fd,
                char *dnprintable = dv->devname;
                char *add_dev = dv->devname;
                int err;
-               int re_add_failed = 0;
+               int array_failed;
 
                next = dv->next;
                jnext = 0;
@@ -440,12 +451,12 @@ int Manage_subdevs(char *devname, int fd,
                    strcmp(dv->devname, "faulty")==0) {
                        int remaining_disks = array.nr_disks;
                        if (dv->disposition != 'r') {
-                               fprintf(stderr, Name ": %s only meaningful "
+                               pr_err("%s only meaningful "
                                        "with -r, not -%c\n",
                                        dv->devname, dv->disposition);
-                               return 1;
+                               goto abort;
                        }
-                       for (; j < 1024 && remaining_disks > 0; j++) {
+                       for (; j < MAX_DISKS && remaining_disks > 0; j++) {
                                unsigned dev;
                                disc.number = j;
                                if (ioctl(fd, GET_DISK_INFO, &disc))
@@ -473,12 +484,12 @@ int Manage_subdevs(char *devname, int fd,
                } else if (strcmp(dv->devname, "detached") == 0) {
                        int remaining_disks = array.nr_disks;
                        if (dv->disposition != 'r' && dv->disposition != 'f') {
-                               fprintf(stderr, Name ": %s only meaningful "
+                               pr_err("%s only meaningful "
                                        "with -r of -f, not -%c\n",
                                        dv->devname, dv->disposition);
-                               return 1;
+                               goto abort;
                        }
-                       for (; j < 1024 && remaining_disks > 0; j++) {
+                       for (; j < MAX_DISKS && remaining_disks > 0; j++) {
                                int sfd;
                                unsigned dev;
                                disc.number = j;
@@ -513,15 +524,15 @@ int Manage_subdevs(char *devname, int fd,
                        if (next != dv)
                                continue;
                } else if (strcmp(dv->devname, "missing") == 0) {
-                       if (dv->disposition != 'a' || dv->re_add == 0) {
-                               fprintf(stderr, Name ": 'missing' only meaningful "
+                       if (dv->disposition != 'A') {
+                               pr_err("'missing' only meaningful "
                                        "with --re-add\n");
-                               return 1;
+                               goto abort;
                        }
                        if (add_devlist == NULL)
                                add_devlist = conf_get_devs();
                        if (add_devlist == NULL) {
-                               fprintf(stderr, Name ": no devices to scan for missing members.");
+                               pr_err("no devices to scan for missing members.");
                                continue;
                        }
                        add_dev = add_devlist->devname;
@@ -537,10 +548,10 @@ int Manage_subdevs(char *devname, int fd,
                        int found = 0;
                        char dname[55];
                        if (dv->disposition != 'r' && dv->disposition != 'f') {
-                               fprintf(stderr, Name ": %s only meaningful "
+                               pr_err("%s only meaningful "
                                        "with -r or -f, not -%c\n",
                                        dv->devname, dv->disposition);
-                               return 1;
+                               goto abort;
                        }
 
                        sprintf(dname, "dev-%s", dv->devname);
@@ -559,10 +570,10 @@ int Manage_subdevs(char *devname, int fd,
                        if (!found) {
                                sysfd = sysfs_open(fd2devnum(fd), dname, "state");
                                if (sysfd < 0) {
-                                       fprintf(stderr, Name ": %s does not appear "
+                                       pr_err("%s does not appear "
                                                "to be a component of %s\n",
                                                dv->devname, devname);
-                                       return 1;
+                                       goto abort;
                                }
                        }
                } else {
@@ -577,43 +588,50 @@ int Manage_subdevs(char *devname, int fd,
                                ;
                        else {
                                if (tfd < 0 || fstat(tfd, &stb) != 0) {
-                                       fprintf(stderr, Name ": cannot find %s: %s\n",
+                                       pr_err("cannot find %s: %s\n",
                                                dv->devname, strerror(errno));
                                        if (tfd >= 0)
                                                close(tfd);
-                                       return 1;
+                                       goto abort;
                                }
                                close(tfd);
                                tfd = -1;
                        }
                        if ((stb.st_mode & S_IFMT) != S_IFBLK) {
-                               fprintf(stderr, Name ": %s is not a "
+                               pr_err("%s is not a "
                                        "block device.\n",
                                        dv->devname);
-                               return 1;
+                               goto abort;
                        }
                }
                switch(dv->disposition){
                default:
-                       fprintf(stderr, Name ": internal error - devmode[%s]=%d\n",
+                       pr_err("internal error - devmode[%s]=%d\n",
                                dv->devname, dv->disposition);
-                       return 1;
+                       goto abort;
                case 'a':
+               case 'A':
                        /* add the device */
                        if (subarray) {
-                               fprintf(stderr, Name ": Cannot add disks to a"
+                               pr_err("Cannot add disks to a"
                                        " \'member\' array, perform this"
                                        " operation on the parent container\n");
-                               return 1;
+                               goto abort;
                        }
                        /* Make sure it isn't in use (in 2.6 or later) */
                        tfd = dev_open(add_dev, O_RDONLY|O_EXCL|O_DIRECT);
                        if (tfd < 0 && add_dev != dv->devname)
                                continue;
                        if (tfd < 0) {
-                               fprintf(stderr, Name ": Cannot open %s: %s\n",
+                               pr_err("Cannot open %s: %s\n",
                                        dv->devname, strerror(errno));
-                               return 1;
+                               goto abort;
+                       }
+                       if (!frozen) {
+                               if (sysfs_freeze_array(&info) == 1)
+                                       frozen = 1;
+                               else
+                                       frozen = -1;
                        }
 
                        st = dup_super(tst);
@@ -623,10 +641,12 @@ int Manage_subdevs(char *devname, int fd,
 
                        if (add_dev == dv->devname) {
                                if (!get_dev_size(tfd, dv->devname, &ldsize)) {
+                                       st->ss->free_super(st);
                                        close(tfd);
-                                       return 1;
+                                       goto abort;
                                }
                        } else if (!get_dev_size(tfd, NULL, &ldsize)) {
+                               st->ss->free_super(st);
                                close(tfd);
                                tfd = -1;
                                continue;
@@ -637,38 +657,38 @@ int Manage_subdevs(char *devname, int fd,
                                    array.raid_disks, NULL,
                                    ldsize >> 9, NULL, NULL, 0) == 0) {
                                if (!force) {
-                                       fprintf(stderr, Name
-                                               ": %s is larger than %s can "
-                                               "effectively use.\n"
-                                               "       Add --force is you "
-                                               "really wan to add this device.\n",
-                                               add_dev, devname);
+                                       pr_err("%s is larger than %s can "
+                                              "effectively use.\n"
+                                              "       Add --force is you "
+                                              "really want to add this device.\n",
+                                              add_dev, devname);
+                                       st->ss->free_super(st);
                                        close(tfd);
-                                       return 1;
+                                       goto abort;
                                }
-                               fprintf(stderr, Name
-                                       ": %s is larger than %s can "
-                                       "effectively use.\n"
-                                       "       Adding anyway as --force "
-                                       "was given.\n",
-                                       add_dev, devname);
+                               pr_err("%s is larger than %s can "
+                                      "effectively use.\n"
+                                      "       Adding anyway as --force "
+                                      "was given.\n",
+                                      add_dev, devname);
                        }
                        if (!tst->ss->external &&
                            array.major_version == 0 &&
                            md_get_version(fd)%100 < 2) {
                                close(tfd);
+                               st->ss->free_super(st);
                                tfd = -1;
                                if (ioctl(fd, HOT_ADD_DISK,
                                          (unsigned long)stb.st_rdev)==0) {
                                        if (verbose >= 0)
-                                               fprintf(stderr, Name ": hot added %s\n",
+                                               pr_err("hot added %s\n",
                                                        add_dev);
                                        continue;
                                }
 
-                               fprintf(stderr, Name ": hot add failed for %s: %s\n",
+                               pr_err("hot add failed for %s: %s\n",
                                        add_dev, strerror(errno));
-                               return 1;
+                               goto abort;
                        }
 
                        if (array.not_persistent == 0 || tst->ss->external) {
@@ -705,10 +725,16 @@ int Manage_subdevs(char *devname, int fd,
                                        break;
                                }
                                /* FIXME this is a bad test to be using */
-                               if (!tst->sb) {
+                               if (!tst->sb && dv->disposition == 'A') {
+                                       /* we are re-adding a device to a
+                                        * completely dead array - have to depend
+                                        * on kernel to check
+                                        */
+                               } else if (!tst->sb) {
                                        close(tfd);
-                                       fprintf(stderr, Name ": cannot load array metadata from %s\n", devname);
-                                       return 1;
+                                       st->ss->free_super(st);
+                                       pr_err("cannot load array metadata from %s\n", devname);
+                                       goto abort;
                                }
 
                                /* Make sure device is large enough */
@@ -716,23 +742,28 @@ int Manage_subdevs(char *devname, int fd,
                                    array_size) {
                                        close(tfd);
                                        tfd = -1;
+                                       st->ss->free_super(st);
                                        if (add_dev != dv->devname)
                                                continue;
-                                       fprintf(stderr, Name ": %s not large enough to join array\n",
+                                       pr_err("%s not large enough to join array\n",
                                                dv->devname);
-                                       return 1;
+                                       goto abort;
                                }
 
                                /* Possibly this device was recently part of the array
                                 * and was temporarily removed, and is now being re-added.
                                 * If so, we can simply re-add it.
                                 */
-                               tst->ss->uuid_from_super(tst, duuid);
 
                                if (st->sb) {
                                        struct mdinfo mdi;
                                        st->ss->getinfo_super(st, &mdi, NULL);
                                        st->ss->uuid_from_super(st, ouuid);
+                                       if (tst->sb)
+                                               tst->ss->uuid_from_super(tst, duuid);
+                                       else
+                                               /* Assume uuid matches: kernel will check */
+                                               memcpy(duuid, ouuid, sizeof(ouuid));
                                        if ((mdi.disk.state & (1<<MD_DISK_ACTIVE)) &&
                                            !(mdi.disk.state & (1<<MD_DISK_FAULTY)) &&
                                            memcmp(duuid, ouuid, sizeof(ouuid))==0) {
@@ -748,7 +779,7 @@ int Manage_subdevs(char *devname, int fd,
                                                disc.number = mdi.disk.number;
                                                if (ioctl(fd, GET_DISK_INFO, &disc) != 0
                                                    || disc.major != 0 || disc.minor != 0
-                                                   || !enough_fd(fd))
+                                                       )
                                                        goto skip_re_add;
                                                disc.major = major(stb.st_rdev);
                                                disc.minor = minor(stb.st_rdev);
@@ -766,9 +797,10 @@ int Manage_subdevs(char *devname, int fd,
                                                        int rv = -1;
                                                        tfd = dev_open(dv->devname, O_RDWR);
                                                        if (tfd < 0) {
-                                                               fprintf(stderr, Name ": failed to open %s for"
+                                                               pr_err("failed to open %s for"
                                                                        " superblock update during re-add\n", dv->devname);
-                                                               return 1;
+                                                               st->ss->free_super(st);
+                                                               goto abort;
                                                        }
 
                                                        if (dv->writemostly == 1)
@@ -788,71 +820,89 @@ int Manage_subdevs(char *devname, int fd,
                                                        close(tfd);
                                                        tfd = -1;
                                                        if (rv != 0) {
-                                                               fprintf(stderr, Name ": failed to update"
-                                                                       " superblock during re-add\n");
-                                                               return 1;
+                                                               pr_err("failed to update"
+                                                                      " superblock during re-add\n");
+                                                               st->ss->free_super(st);
+                                                               goto abort;
                                                        }
                                                }
                                                /* don't even try if disk is marked as faulty */
                                                errno = 0;
                                                if (ioctl(fd, ADD_NEW_DISK, &disc) == 0) {
                                                        if (verbose >= 0)
-                                                               fprintf(stderr, Name ": re-added %s\n", add_dev);
+                                                               pr_err("re-added %s\n", add_dev);
                                                        count++;
+                                                       st->ss->free_super(st);
                                                        continue;
                                                }
                                                if (errno == ENOMEM || errno == EROFS) {
-                                                       fprintf(stderr, Name ": add new device failed for %s: %s\n",
+                                                       pr_err("add new device failed for %s: %s\n",
                                                                add_dev, strerror(errno));
+                                                       st->ss->free_super(st);
                                                        if (add_dev != dv->devname)
                                                                continue;
-                                                       return 1;
+                                                       goto abort;
                                                }
-                                       skip_re_add:
-                                               re_add_failed = 1;
                                        }
+                               skip_re_add:
                                        st->ss->free_super(st);
                                }
                                if (add_dev != dv->devname) {
                                        if (verbose > 0)
-                                               fprintf(stderr, Name
-                                                       ": --re-add for %s to %s is not possible\n",
-                                                       add_dev, devname);
+                                               pr_err("--re-add for %s to %s is not possible\n",
+                                                      add_dev, devname);
                                        if (tfd >= 0) {
                                                close(tfd);
                                                tfd = -1;
                                        }
                                        continue;
                                }
-                               if (dv->re_add) {
+                               if (dv->disposition == 'A') {
                                        if (tfd >= 0)
                                                close(tfd);
-                                       fprintf(stderr, Name
-                                               ": --re-add for %s to %s is not possible\n",
-                                               dv->devname, devname);
-                                       return 1;
+                                       pr_err("--re-add for %s to %s is not possible\n",
+                                              dv->devname, devname);
+                                       goto abort;
                                }
-                               if (re_add_failed) {
-                                       fprintf(stderr, Name ": %s reports being an active member for %s, but a --re-add fails.\n",
-                                               dv->devname, devname);
-                                       fprintf(stderr, Name ": not performing --add as that would convert %s in to a spare.\n",
-                                               dv->devname);
-                                       fprintf(stderr, Name ": To make this a spare, use \"mdadm --zero-superblock %s\" first.\n",     
+                               if (array.active_disks < array.raid_disks) {
+                                       char *avail = xcalloc(array.raid_disks, 1);
+                                       int d;
+                                       int found = 0;
+
+                                       for (d = 0; d < MAX_DISKS && found < array.active_disks; d++) {
+                                               disc.number = d;
+                                               if (ioctl(fd, GET_DISK_INFO, &disc))
+                                                       continue;
+                                               if (disc.major == 0 && disc.minor == 0)
+                                                       continue;
+                                               if (!(disc.state & (1<<MD_DISK_SYNC)))
+                                                       continue;
+                                               avail[disc.raid_disk] = 1;
+                                               found++;
+                                       }
+                                       array_failed = !enough(array.level, array.raid_disks, 
+                                                              array.layout, 1, avail);
+                               } else
+                                       array_failed = 0;
+                               if (array_failed) {
+                                       pr_err("%s has failed so using --add cannot work and might destroy\n",
+                                               devname);
+                                       pr_err("data on %s.  You should stop the array and re-assemble it.\n",
                                                dv->devname);
                                        if (tfd >= 0)
                                                close(tfd);
-                                       return 1;
+                                       goto abort;
                                }
                        } else {
                                /* non-persistent. Must ensure that new drive
                                 * is at least array.size big.
                                 */
                                if (ldsize/512 < array_size) {
-                                       fprintf(stderr, Name ": %s not large enough to join array\n",
+                                       pr_err("%s not large enough to join array\n",
                                                dv->devname);
                                        if (tfd >= 0)
                                                close(tfd);
-                                       return 1;
+                                       goto abort;
                                }
                        }
                        /* committed to really trying this device now*/
@@ -887,19 +937,18 @@ int Manage_subdevs(char *devname, int fd,
                                if (tst->ss->add_to_super(tst, &disc, dfd,
                                                          dv->devname)) {
                                        close(dfd);
-                                       return 1;
+                                       goto abort;
                                }
                                if (tst->ss->write_init_super(tst)) {
                                        close(dfd);
-                                       return 1;
+                                       goto abort;
                                }
-                       } else if (dv->re_add) {
+                       } else if (dv->disposition == 'A') {
                                /*  this had better be raid1.
                                 * As we are "--re-add"ing we must find a spare slot
                                 * to fill.
                                 */
-                               char *used = malloc(array.raid_disks);
-                               memset(used, 0, array.raid_disks);
+                               char *used = xcalloc(array.raid_disks, 1);
                                for (j=0; j< tst->max_devs; j++) {
                                        mdu_disk_info_t disc2;
                                        disc2.number = j;
@@ -936,11 +985,11 @@ int Manage_subdevs(char *devname, int fd,
 
                                container_fd = open_dev_excl(devnum);
                                if (container_fd < 0) {
-                                       fprintf(stderr, Name ": add failed for %s:"
-                                               " could not get exclusive access to container\n",
-                                               dv->devname);
+                                       pr_err("add failed for %s:"
+                                              " could not get exclusive access to container\n",
+                                              dv->devname);
                                        tst->ss->free_super(tst);
-                                       return 1;
+                                       goto abort;
                                }
 
                                dfd = dev_open(dv->devname, O_RDWR | O_EXCL|O_DIRECT);
@@ -950,7 +999,7 @@ int Manage_subdevs(char *devname, int fd,
                                                          dv->devname)) {
                                        close(dfd);
                                        close(container_fd);
-                                       return 1;
+                                       goto abort;
                                }
                                if (tst->update_tail)
                                        flush_metadata_updates(tst);
@@ -959,11 +1008,11 @@ int Manage_subdevs(char *devname, int fd,
 
                                sra = sysfs_read(container_fd, -1, 0);
                                if (!sra) {
-                                       fprintf(stderr, Name ": add failed for %s: sysfs_read failed\n",
+                                       pr_err("add failed for %s: sysfs_read failed\n",
                                                dv->devname);
                                        close(container_fd);
                                        tst->ss->free_super(tst);
-                                       return 1;
+                                       goto abort;
                                }
                                sra->array.level = LEVEL_CONTAINER;
                                /* Need to set data_offset and component_size */
@@ -975,11 +1024,11 @@ int Manage_subdevs(char *devname, int fd,
                                 * would block add_disk */
                                tst->ss->free_super(tst);
                                if (sysfs_add_disk(sra, &new_mdi, 0) != 0) {
-                                       fprintf(stderr, Name ": add new device to external metadata"
+                                       pr_err("add new device to external metadata"
                                                " failed for %s\n", dv->devname);
                                        close(container_fd);
                                        sysfs_free(sra);
-                                       return 1;
+                                       goto abort;
                                }
                                ping_monitor_by_id(devnum);
                                sysfs_free(sra);
@@ -987,24 +1036,24 @@ int Manage_subdevs(char *devname, int fd,
                        } else {
                                tst->ss->free_super(tst);
                                if (ioctl(fd, ADD_NEW_DISK, &disc)) {
-                                       fprintf(stderr, Name ": add new device failed for %s as %d: %s\n",
+                                       pr_err("add new device failed for %s as %d: %s\n",
                                                dv->devname, j, strerror(errno));
-                                       return 1;
+                                       goto abort;
                                }
                        }
                        if (verbose >= 0)
-                               fprintf(stderr, Name ": added %s\n", dv->devname);
+                               pr_err("added %s\n", dv->devname);
                        break;
 
                case 'r':
                        /* hot remove */
                        if (subarray) {
-                               fprintf(stderr, Name ": Cannot remove disks from a"
+                               pr_err("Cannot remove disks from a"
                                        " \'member\' array, perform this"
                                        " operation on the parent container\n");
                                if (sysfd >= 0)
                                        close(sysfd);
-                               return 1;
+                               goto abort;
                        }
                        if (tst->ss->external) {
                                /* To remove a device from a container, we must
@@ -1019,12 +1068,11 @@ int Manage_subdevs(char *devname, int fd,
                                int dnum = fd2devnum(fd);
                                lfd = open_dev_excl(dnum);
                                if (lfd < 0) {
-                                       fprintf(stderr, Name
-                                               ": Cannot get exclusive access "
-                                               " to container - odd\n");
+                                       pr_err("Cannot get exclusive access "
+                                              " to container - odd\n");
                                        if (sysfd >= 0)
                                                close(sysfd);
-                                       return 1;
+                                       goto abort;
                                }
                                /* in the detached case it is not possible to
                                 * check if we are the unique holder, so just
@@ -1035,13 +1083,12 @@ int Manage_subdevs(char *devname, int fd,
                                    sysfs_unique_holder(dnum, stb.st_rdev))
                                        /* pass */;
                                else {
-                                       fprintf(stderr, Name
-                                               ": %s is %s, cannot remove.\n",
-                                               dnprintable,
-                                               errno == EEXIST ? "still in use":
-                                               "not a member");
+                                       pr_err("%s is %s, cannot remove.\n",
+                                              dnprintable,
+                                              errno == EEXIST ? "still in use":
+                                              "not a member");
                                        close(lfd);
-                                       return 1;
+                                       goto abort;
                                }
                        }
                        /* FIXME check that it is a current member */
@@ -1079,12 +1126,12 @@ int Manage_subdevs(char *devname, int fd,
                                }
                        }
                        if (err) {
-                               fprintf(stderr, Name ": hot remove failed "
-                                       "for %s: %s\n", dnprintable,
-                                       strerror(errno));
+                               pr_err("hot remove failed "
+                                      "for %s: %s\n",  dnprintable,
+                                      strerror(errno));
                                if (lfd >= 0)
                                        close(lfd);
-                               return 1;
+                               goto abort;
                        }
                        if (tst->ss->external) {
                                /*
@@ -1096,8 +1143,8 @@ int Manage_subdevs(char *devname, int fd,
                                char *name = devnum2devname(fd2devnum(fd));
 
                                if (!name) {
-                                       fprintf(stderr, Name ": unable to get container name\n");
-                                       return 1;
+                                       pr_err("unable to get container name\n");
+                                       goto abort;
                                }
 
                                ping_manager(name);
@@ -1107,7 +1154,7 @@ int Manage_subdevs(char *devname, int fd,
                                close(lfd);
                        count++;
                        if (verbose >= 0)
-                               fprintf(stderr, Name ": hot removed %s from %s\n",
+                               pr_err("hot removed %s from %s\n",
                                        dnprintable, devname);
                        break;
 
@@ -1116,25 +1163,32 @@ int Manage_subdevs(char *devname, int fd,
                        if ((sysfd >= 0 && write(sysfd, "faulty", 6) != 6) ||
                            (sysfd < 0 && ioctl(fd, SET_DISK_FAULTY,
                                                (unsigned long) stb.st_rdev))) {
-                               fprintf(stderr, Name ": set device faulty failed for %s:  %s\n",
+                               pr_err("set device faulty failed for %s:  %s\n",
                                        dnprintable, strerror(errno));
                                if (sysfd >= 0)
                                        close(sysfd);
-                               return 1;
+                               goto abort;
                        }
                        if (sysfd >= 0)
                                close(sysfd);
                        sysfd = -1;
                        count++;
                        if (verbose >= 0)
-                               fprintf(stderr, Name ": set %s faulty in %s\n",
+                               pr_err("set %s faulty in %s\n",
                                        dnprintable, devname);
                        break;
                }
        }
+       if (frozen > 0)
+               sysfs_set_str(&info, NULL, "sync_action","idle");
        if (test && count == 0)
                return 2;
        return 0;
+
+abort:
+       if (frozen > 0)
+               sysfs_set_str(&info, NULL, "sync_action","idle");
+       return 1;
 }
 
 int autodetect(void)
@@ -1163,9 +1217,8 @@ int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident
 
        if (!st->ss->update_subarray) {
                if (!quiet)
-                       fprintf(stderr,
-                               Name ": Operation not supported for %s metadata\n",
-                               st->ss->name);
+                       pr_err("Operation not supported for %s metadata\n",
+                              st->ss->name);
                goto free_super;
        }
 
@@ -1176,7 +1229,7 @@ int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident
 
        if (rv) {
                if (!quiet)
-                       fprintf(stderr, Name ": Failed to update %s of subarray-%s in %s\n",
+                       pr_err("Failed to update %s of subarray-%s in %s\n",
                                update, subarray, dev);
        } else if (st->update_tail)
                flush_metadata_updates(st);
@@ -1184,9 +1237,8 @@ int Update_subarray(char *dev, char *subarray, char *update, struct mddev_ident
                st->ss->sync_metadata(st);
 
        if (rv == 0 && strcmp(update, "name") == 0 && !quiet)
-               fprintf(stderr,
-                       Name ": Updated subarray-%s name from %s, UUIDs may have changed\n",
-                       subarray, dev);
+               pr_err("Updated subarray-%s name from %s, UUIDs may have changed\n",
+                      subarray, dev);
 
  free_super:
        st->ss->free_super(st);
@@ -1216,7 +1268,6 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)
 
        devlist.next = NULL;
        devlist.used = 0;
-       devlist.re_add = 0;
        devlist.writemostly = 0;
        devlist.devname = devname;
        sprintf(devname, "%d:%d", major(devid), minor(devid));