Add DDF code for activate_spare

[thirdparty/mdadm.git] / sysfs.c

diff --git a/sysfs.c b/sysfs.c
index 34840f7698c7d4c0998d7f705b24c28d03b3ffc6..bbb9cd37c884aeb7fbbd5e6c980445f8d0b93417 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -74,7 +74,7 @@ int sysfs_open(int devnum, char *devname, char *attr)
        }
        strcat(fname, attr);
        fd = open(fname, O_RDWR);
-       if (fd < 0 && errno == -EACCES)
+       if (fd < 0 && errno == EACCES)
                fd = open(fname, O_RDONLY);
        return fd;
 }
@@ -92,7 +92,7 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
        char *dbase;
        struct mdinfo *sra;
        struct mdinfo *dev;
-       DIR *dir;
+       DIR *dir = NULL;
        struct dirent *de;
 
        sra = malloc(sizeof(*sra));
@@ -253,9 +253,12 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
                        dev->errors = strtoul(buf, NULL, 0);
                }
        }
+       closedir(dir);
        return sra;
 
  abort:
+       if (dir)
+               closedir(dir);
        sysfs_free(sra);
        return NULL;
 }
@@ -296,6 +299,7 @@ int sysfs_set_str(struct mdinfo *sra, struct mdinfo *dev,
        char fname[50];
        int n;
        int fd;
+
        sprintf(fname, "/sys/block/%s/md/%s/%s",
                sra->sys_name, dev?dev->sys_name:"", name);
        fd = open(fname, O_WRONLY);
@@ -359,7 +363,7 @@ int sysfs_set_array(struct mdinfo *sra,
        return rv;
 }
 
-int sysfs_add_disk(struct mdinfo *sra, int fd, struct mdinfo *sd)
+int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)
 {
        char dv[100];
        char nm[100];
@@ -387,10 +391,11 @@ int sysfs_add_disk(struct mdinfo *sra, int fd, struct mdinfo *sd)
                rv |= sysfs_set_num(sra, sd, "slot", sd->disk.raid_disk);
 //             rv |= sysfs_set_str(sra, sd, "state", "in_sync");
        }
-       sd2 = malloc(sizeof(*sd2));
-       *sd2 = *sd;
-       sd2->next = sra->devs;
-       sra->devs = sd2;
-
+       if (! rv) {
+               sd2 = malloc(sizeof(*sd2));
+               *sd2 = *sd;
+               sd2->next = sra->devs;
+               sra->devs = sd2;
+       }
        return rv;
 }