mdadm-1.0.0

[thirdparty/mdadm.git] / Manage.c

diff --git a/Manage.c b/Manage.c
index b3e048e6d5b7cf116706bb5eb4ba3084dcd62677..34076cbfe63e0d7d13b64b984950902d72e1a2a5 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -77,7 +77,6 @@ int Manage_runstop(char *devname, int fd, int runstop)
        /* Run or stop the array. array must already be configured
         * required >= 0.90.0
         */
-       mdu_array_info_t array;
        mdu_param_t param; /* unused */
 
        if (runstop == -1 && md_get_version(fd) < 9000) {
@@ -130,9 +129,9 @@ int Manage_subdevs(char *devname, int fd,
        mdu_disk_info_t disc;
        mddev_dev_t dv;
        struct stat stb;
-       int i,j;
+       int j;
        int save_errno;
-       static buf[4096];
+       static char buf[4096];
 
        if (ioctl(fd, GET_ARRAY_INFO, &array)) {
                fprintf(stderr, Name ": cannot get array info for %s\n",
@@ -152,8 +151,8 @@ int Manage_subdevs(char *devname, int fd,
                }
                switch(dv->disposition){
                default:
-                       fprintf(stderr, Name ": internal error - devmode[%d]=%d\n",
-                               i, dv->disposition);
+                       fprintf(stderr, Name ": internal error - devmode[%s]=%d\n",
+                               dv->devname, dv->disposition);
                        return 1;
                case 'a':
                        /* add the device - hot or cold */
@@ -191,7 +190,7 @@ int Manage_subdevs(char *devname, int fd,
                        disc.major = MAJOR(stb.st_rdev);
                        disc.minor = MINOR(stb.st_rdev);
                        if (ioctl(fd,ADD_NEW_DISK, &disc)) {
-                               fprintf(stderr, Name ": add new disk failed for %s: %s\n",
+                               fprintf(stderr, Name ": add new device failed for %s: %s\n",
                                        dv->devname, strerror(errno));
                                return 1;
                        }
@@ -212,7 +211,7 @@ int Manage_subdevs(char *devname, int fd,
                case 'f': /* set faulty */
                        /* FIXME check current member */
                        if (ioctl(fd, SET_DISK_FAULTY, (unsigned long) stb.st_rdev)) {
-                               fprintf(stderr, Name ": set disk faulty failed for %s:  %s\n",
+                               fprintf(stderr, Name ": set device faulty failed for %s:  %s\n",
                                        dv->devname, strerror(errno));
                                return 1;
                        }