Remember to close directories when we are finished with them.

[thirdparty/mdadm.git] / sysfs.c

diff --git a/sysfs.c b/sysfs.c
index d77080b93c2cd1e2387c7dde3008a9c31e90a86f..ea7d52f6c025be17a47a1774e3bd5bec843fe261 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -34,7 +34,7 @@ int load_sys(char *path, char *buf)
                return -1;
        n = read(fd, buf, 1024);
        close(fd);
-       if (n <=0 || n >= 1024)
+       if (n <0 || n >= 1024)
                return -1;
        buf[n] = 0;
        if (buf[n-1] == '\n')
@@ -56,6 +56,29 @@ void sysfs_free(struct mdinfo *sra)
        }
 }
 
+int sysfs_open(int devnum, char *devname, char *attr)
+{
+       char fname[50];
+       char sys_name[16];
+       int fd;
+       if (devnum >= 0)
+               sprintf(sys_name, "md%d", devnum);
+       else
+               sprintf(sys_name, "md_d%d",
+                       -1-devnum);
+
+       sprintf(fname, "/sys/block/%s/md/", sys_name);
+       if (devname) {
+               strcat(fname, devname);
+               strcat(fname, "/");
+       }
+       strcat(fname, attr);
+       fd = open(fname, O_RDWR);
+       if (fd < 0 && errno == -EACCES)
+               fd = open(fname, O_RDONLY);
+       return fd;
+}
+
 struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
 {
        /* Longest possible name in sysfs, mounted at /sys, is
@@ -69,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));
@@ -84,10 +107,10 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
                if (ioctl(fd, RAID_VERSION, &vers) != 0)
                        return NULL;
                if (major(stb.st_rdev)==9)
-                       sprintf(sra->sys_name, "md%d", minor(stb.st_rdev));
+                       sprintf(sra->sys_name, "md%d", (int)minor(stb.st_rdev));
                else
                        sprintf(sra->sys_name, "md_d%d",
-                               minor(stb.st_rdev)>>MdpMinorShift);
+                               (int)minor(stb.st_rdev)>>MdpMinorShift);
        } else {
                if (devnum >= 0)
                        sprintf(sra->sys_name, "md%d", devnum);
@@ -128,6 +151,12 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
                        goto abort;
                sra->array.layout = strtoul(buf, NULL, 0);
        }
+       if (options & GET_DISKS) {
+               strcpy(base, "raid_disks");
+               if (load_sys(fname, buf))
+                       goto abort;
+               sra->array.raid_disks = strtoul(buf, NULL, 0);
+       }
        if (options & GET_COMPONENT) {
                strcpy(base, "component_size");
                if (load_sys(fname, buf))
@@ -224,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;
 }
@@ -246,10 +278,10 @@ unsigned long long get_component_size(int fd)
        if (fstat(fd, &stb)) return 0;
        if (major(stb.st_rdev) == 9)
                sprintf(fname, "/sys/block/md%d/md/component_size",
-                       minor(stb.st_rdev));
+                       (int)minor(stb.st_rdev));
        else
                sprintf(fname, "/sys/block/md_d%d/md/component_size",
-                       minor(stb.st_rdev)>>MdpMinorShift);
+                       (int)minor(stb.st_rdev)>>MdpMinorShift);
        fd = open(fname, O_RDONLY);
        if (fd < 0)
                return 0;
@@ -310,3 +342,58 @@ int sysfs_get_ll(struct mdinfo *sra, struct mdinfo *dev,
                return -1;
        return 0;
 }
+
+int sysfs_set_array(struct mdinfo *sra,
+                   struct mdinfo *info)
+{
+       int rv = 0;
+       sra->array = info->array;
+
+       if (info->array.level < 0)
+               return 0; /* FIXME */
+       rv |= sysfs_set_str(sra, NULL, "level",
+                           map_num(pers, info->array.level));
+       rv |= sysfs_set_num(sra, NULL, "raid_disks", info->array.raid_disks);
+       rv |= sysfs_set_num(sra, NULL, "chunk_size", info->array.chunk_size);
+       rv |= sysfs_set_num(sra, NULL, "layout", info->array.layout);
+       rv |= sysfs_set_num(sra, NULL, "component_size", info->component_size);
+       rv |= sysfs_set_num(sra, NULL, "resync_start", info->resync_start);
+       sra->array = info->array;
+       return rv;
+}
+
+int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)
+{
+       char dv[100];
+       char nm[100];
+       struct mdinfo *sd2;
+       char *dname;
+       int rv;
+
+       sprintf(dv, "%d:%d", sd->disk.major, sd->disk.minor);
+       rv = sysfs_set_str(sra, NULL, "new_dev", dv);
+       if (rv)
+               return rv;
+
+       memset(nm, 0, sizeof(nm));
+       sprintf(dv, "/sys/dev/block/%d:%d", sd->disk.major, sd->disk.minor);
+       if (readlink(dv, nm, sizeof(nm)) < 0)
+               return -1;
+       dname = strrchr(nm, '/');
+       if (dname) dname++;
+       strcpy(sd->sys_name, "dev-");
+       strcpy(sd->sys_name+4, dname);
+
+       rv |= sysfs_set_num(sra, sd, "offset", sd->data_offset);
+       rv |= sysfs_set_num(sra, sd, "size", (sd->component_size+1) / 2);
+       if (sra->array.level != LEVEL_CONTAINER) {
+               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;
+
+       return rv;
+}