Teach sysfs_add_disk() callers to use ->recovery_start versus 'insync' parameter

[thirdparty/mdadm.git] / sysfs.c

diff --git a/sysfs.c b/sysfs.c
index 35dfbd450bc9742ca25f16a72c7075bef4cfe858..8fdb52998409303e3874f84b6fe5a1eea8820aee 100644 (file)
--- a/sysfs.c
+++ b/sysfs.c
@@ -572,7 +572,7 @@ int sysfs_set_array(struct mdinfo *info, int vers)
        return rv;
 }
 
        return rv;
 }
 

-int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int in_sync)
+int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)

 {
        char dv[100];
        char nm[100];
 {
        char dv[100];
        char nm[100];


@@ -598,11 +598,11 @@ int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int in_sync)
        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, "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)
+               if (sd->recovery_start == MaxSector)

                        /* This can correctly fail if array isn't started,
                         * yet, so just ignore status for now.
                         */
                        /* This can correctly fail if array isn't started,
                         * yet, so just ignore status for now.
                         */

-                       sysfs_set_str(sra, sd, "state", "in_sync");
+                       sysfs_set_str(sra, sd, "state", "insync");

                rv |= sysfs_set_num(sra, sd, "slot", sd->disk.raid_disk);
        }
        return rv;
                rv |= sysfs_set_num(sra, sd, "slot", sd->disk.raid_disk);
        }
        return rv;