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

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index 662061b0b29fd61dcf7e5b3041e3d4a8c7a33938..05be64c6add692959d89e94ab00cd83963d2aa02 100644 (file)
--- a/util.c
+++ b/util.c
@@ -261,9 +261,9 @@ int enough(int level, int raid_disks, int layout, int clean,
                } while (first != 0);
                return 1;
 
                } while (first != 0);
                return 1;
 

-       case -4:
+       case LEVEL_MULTIPATH:

                return avail_disks>= 1;
                return avail_disks>= 1;

-       case -1:
+       case LEVEL_LINEAR:

        case 0:
                return avail_disks == raid_disks;
        case 1:
        case 0:
                return avail_disks == raid_disks;
        case 1:


@@ -336,17 +336,15 @@ void copy_uuid(void *a, int b[4], int swapuuid)
                memcpy(a, b, 16);
 }
 
                memcpy(a, b, 16);
 }
 

-char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep)
+char *__fname_from_uuid(int id[4], int swap, char *buf, char sep)

 {
        int i, j;
 {
        int i, j;

-       int id;

        char uuid[16];
        char *c = buf;
        strcpy(c, "UUID-");
        c += strlen(c);
        char uuid[16];
        char *c = buf;
        strcpy(c, "UUID-");
        c += strlen(c);

-       copy_uuid(uuid, info->uuid, st->ss->swapuuid);
+       copy_uuid(uuid, id, swap);

        for (i = 0; i < 4; i++) {
        for (i = 0; i < 4; i++) {

-               id = uuid[i];

                if (i)
                        *c++ = sep;
                for (j = 3; j >= 0; j--) {
                if (i)
                        *c++ = sep;
                for (j = 3; j >= 0; j--) {


@@ -355,6 +353,12 @@ char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char
                }
        }
        return buf;
                }
        }
        return buf;

+
+}
+
+char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep)
+{
+       return __fname_from_uuid(info->uuid, st->ss->swapuuid, buf, sep);

 }
 
 #ifndef MDASSEMBLE
 }
 
 #ifndef MDASSEMBLE


@@ -1158,8 +1162,11 @@ int add_disk(int mdfd, struct supertype *st,
        int rv;
 #ifndef MDASSEMBLE
        if (st->ss->external) {
        int rv;
 #ifndef MDASSEMBLE
        if (st->ss->external) {

-               rv = sysfs_add_disk(sra, info,
-                                   info->disk.state & (1<<MD_DISK_SYNC));
+               if (info->disk.state & (1<<MD_DISK_SYNC))
+                       info->recovery_start = MaxSector;
+               else
+                       info->recovery_start = 0;
+               rv = sysfs_add_disk(sra, info);

                if (! rv) {
                        struct mdinfo *sd2;
                        for (sd2 = sra->devs; sd2; sd2=sd2->next)
                if (! rv) {
                        struct mdinfo *sd2;
                        for (sd2 = sra->devs; sd2; sd2=sd2->next)


@@ -1206,7 +1213,7 @@ int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info)
 char *devnum2devname(int num)
 {
        char name[100];
 char *devnum2devname(int num)
 {
        char name[100];

-       if (num > 0)
+       if (num >= 0)

                sprintf(name, "md%d", num);
        else
                sprintf(name, "md_d%d", -1-num);
                sprintf(name, "md%d", num);
        else
                sprintf(name, "md_d%d", -1-num);