Use O_EXCL when opening component devices to be assembled into an array

[thirdparty/mdadm.git] / Manage.c

diff --git a/Manage.c b/Manage.c
index b3e048e6d5b7cf116706bb5eb4ba3084dcd62677..b323fd3c241b514c24a3138b7f332e09c8841fd8 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) {
@@ -115,6 +114,44 @@ int Manage_runstop(char *devname, int fd, int runstop)
        return 0;
 }
 
+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",
+                       devname, strerror(errno));
+               return 1;
+       }
+       if (size >= 0)
+               info.size = size;
+       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",
+                       devname, strerror(errno));
+               return 1;
+       }
+       return 0;
+}
+
+int Manage_reconfig(char *devname, int fd, int layout)
+{
+       mdu_array_info_t info;
+       if (ioctl(fd, GET_ARRAY_INFO, &info) != 0) {
+               fprintf(stderr, Name ": Cannot get array information for %s: %s\n",
+                       devname, strerror(errno));
+               return 1;
+       }
+       info.layout = layout;
+       printf("layout set to %d\n", info.layout);
+       if (ioctl(fd, SET_ARRAY_INFO, &info) != 0) {
+               fprintf(stderr, Name ": Cannot set layout for %s: %s\n",
+                       devname, strerror(errno));
+               return 1;
+       }
+       return 0;
+}
+
 int Manage_subdevs(char *devname, int fd,
                   mddev_dev_t devlist)
 {
@@ -130,9 +167,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,11 +189,19 @@ 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 */
+                       /* Make sure it isn' in use (in 2.6 or later) */
+                       fd = open(dv->devname, O_RDONLY|O_EXCL);
+                       if (fd < 0) {
+                               fprintf(stderr, Name ": Cannot open %s: %s\n",
+                                       dv->devname, strerror(errno));
+                               return 1;
+                       }
+                       close(fd);
                        if (ioctl(fd, HOT_ADD_DISK, (unsigned long)stb.st_rdev)==0) {
                                fprintf(stderr, Name ": hot added %s\n",
                                        dv->devname);
@@ -178,6 +223,7 @@ int Manage_subdevs(char *devname, int fd,
                         * in case
                         */
                        for (j=0; j<array.nr_disks; j++) {
+                               disc.number = j;
                                if (ioctl(fd, GET_DISK_INFO, &disc))
                                        break;
                                if (disc.major==0 && disc.minor==0)
@@ -188,10 +234,10 @@ int Manage_subdevs(char *devname, int fd,
                        disc.number =j;
                        disc.raid_disk = j;
                        disc.state = 0;
-                       disc.major = MAJOR(stb.st_rdev);
-                       disc.minor = MINOR(stb.st_rdev);
+                       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 +258,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;
                        }