Factor common code into new "start_mdmon".

[thirdparty/mdadm.git] / sysfs.c

diff --git a/sysfs.c b/sysfs.c
index a28442137c3399cdd3146882c3f3db158698c4d3..847a4e1e4caf8d8e38748397eafd664413eea9fa 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -59,15 +59,9 @@ 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);
+       sprintf(fname, "/sys/block/%s/md/", devnum2devname(devnum));
        if (devname) {
                strcat(fname, devname);
                strcat(fname, "/");
@@ -234,7 +228,7 @@ struct mdinfo *sysfs_read(int fd, int devnum, unsigned long options)
                        strcpy(dbase, "size");
                        if (load_sys(fname, buf))
                                goto abort;
-                       dev->component_size = strtoull(buf, NULL, 0);
+                       dev->component_size = strtoull(buf, NULL, 0) * 2;
                }
                if (options & GET_STATE) {
                        dev->disk.state = 0;
@@ -359,7 +353,7 @@ int sysfs_set_array(struct mdinfo *sra,
        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, "component_size", info->component_size/2);
        rv |= sysfs_set_num(sra, NULL, "resync_start", info->resync_start);
        sra->array = info->array;
        return rv;