Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0

[thirdparty/mdadm.git] / sysfs.c

diff --git a/sysfs.c b/sysfs.c
index 31c92f78b79b91c8472ae079c118b670de2a2cf7..b6156636f9811c1df344f484e126ac60e3ccae2f 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -467,23 +467,22 @@ int sysfs_get_ll(struct mdinfo *sra, struct mdinfo *dev,
 }
 
 int sysfs_get_str(struct mdinfo *sra, struct mdinfo *dev,
-                 char *name, char *buf, int buf_len)
+                      char *name, char *val, int size)
 {
        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_RDONLY);
        if (fd < 0)
                return -1;
-       n = read(fd, buf, buf_len);
+       n = read(fd, val, size);
        close(fd);
        if (n <= 0)
                return -1;
-       buf[n] = 0;
-       return 0;
+       val[n] = 0;
+       return n;
 }
 
 int sysfs_set_safemode(struct mdinfo *sra, unsigned long ms)
@@ -545,7 +544,7 @@ int sysfs_set_array(struct mdinfo *info, int vers)
        return rv;
 }
 
-int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)
+int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int in_sync)
 {
        char dv[100];
        char nm[100];
@@ -571,8 +570,12 @@ int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)
        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) {
+               if (in_sync)
+                       /* This can correctly fail if array isn't started,
+                        * yet, so just ignore status for now.
+                        */
+                       sysfs_set_str(sra, sd, "state", "in_sync");
                rv |= sysfs_set_num(sra, sd, "slot", sd->disk.raid_disk);
-//             rv |= sysfs_set_str(sra, sd, "state", "in_sync");
        }
        return rv;
 }