mdmon: allow incremental assembly of containers.

[thirdparty/mdadm.git] / super-ddf.c

diff --git a/super-ddf.c b/super-ddf.c
index f621f4df3922ac43b5932a16a7e40cc982006538..6455deeee148cd1a9cbc01b2e3f37115f612dc39 100644 (file)
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -1000,7 +1000,7 @@ static void print_guid(char *guid, int tstamp)
                printf("%02X", guid[i]&255);
        }
 
-       printf(" (");
+       printf("\n                  (");
        while (l && guid[l-1] == ' ')
                l--;
        for (i=0 ; i<l ; i++) {
@@ -1189,6 +1189,18 @@ static void brief_examine_super_ddf(struct supertype *st)
        }
 }
 
+static void export_examine_super_ddf(struct supertype *st)
+{
+       struct mdinfo info;
+       char nbuf[64];
+       getinfo_super_ddf(st, &info);
+       fname_from_uuid(st, &info, nbuf, ':');
+       printf("MD_METADATA=ddf\n");
+       printf("MD_LEVEL=container\n");
+       printf("MD_UUID=%s\n", nbuf+5);
+}
+       
+
 static void detail_super_ddf(struct supertype *st, char *homehost)
 {
        /* FIXME later
@@ -1323,6 +1335,7 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info)
                info->component_size = ddf->dlist->size - info->data_offset;
        } else {
                info->disk.number = -1;
+               info->disk.raid_disk = -1;
 //             info->disk.raid_disk = find refnum in the table and use index;
        }
        info->disk.state = (1 << MD_DISK_SYNC);
@@ -1481,10 +1494,20 @@ static int update_super_ddf(struct supertype *st, struct mdinfo *info,
        return rv;
 }
 
+__u32 random32(void)
+{
+       __u32 rv;
+       int rfd = open("/dev/urandom", O_RDONLY);
+       if (rfd < 0 || read(rfd, &rv, 4) != 4)
+               rv = random();
+       if (rfd >= 0)
+               close(rfd);
+       return rv;
+}
+
 static void make_header_guid(char *guid)
 {
        __u32 stamp;
-       int rfd;
        /* Create a DDF Header of Virtual Disk GUID */
 
        /* 24 bytes of fiction required.
@@ -1499,11 +1522,8 @@ static void make_header_guid(char *guid)
        memcpy(guid+12, &stamp, 4);
        stamp = __cpu_to_be32(time(0) - DECADE);
        memcpy(guid+16, &stamp, 4);
-       rfd = open("/dev/urandom", O_RDONLY);
-       if (rfd < 0 || read(rfd, &stamp, 4) != 4)
-               stamp = random();
+       stamp = random32();
        memcpy(guid+20, &stamp, 4);
-       if (rfd >= 0) close(rfd);
 }
 
 static int init_super_ddf_bvd(struct supertype *st,
@@ -1759,20 +1779,25 @@ static int layout_to_rlq(int level, int layout, int raiddisks)
                }
                break;
        case 5:
-       case 6:
                switch(layout) {
                case ALGORITHM_LEFT_ASYMMETRIC:
                        return DDF_RAID5_N_RESTART;
                case ALGORITHM_RIGHT_ASYMMETRIC:
-                       if (level == 5)
-                               return DDF_RAID5_0_RESTART;
-                       else
-                               return DDF_RAID6_0_RESTART;
+                       return DDF_RAID5_0_RESTART;
                case ALGORITHM_LEFT_SYMMETRIC:
                        return DDF_RAID5_N_CONTINUE;
                case ALGORITHM_RIGHT_SYMMETRIC:
                        return -1; /* not mentioned in standard */
                }
+       case 6:
+               switch(layout) {
+               case ALGORITHM_ROTATING_N_RESTART:
+                       return DDF_RAID5_N_RESTART;
+               case ALGORITHM_ROTATING_ZERO_RESTART:
+                       return DDF_RAID6_0_RESTART;
+               case ALGORITHM_ROTATING_N_CONTINUE:
+                       return DDF_RAID5_N_CONTINUE;
+               }
        }
        return -1;
 }
@@ -1807,11 +1832,11 @@ static int rlq_to_layout(int rlq, int prl, int raiddisks)
        case DDF_RAID6:
                switch(rlq) {
                case DDF_RAID5_N_RESTART:
-                       return ALGORITHM_LEFT_ASYMMETRIC;
+                       return ALGORITHM_ROTATING_N_RESTART;
                case DDF_RAID6_0_RESTART:
-                       return ALGORITHM_RIGHT_ASYMMETRIC;
+                       return ALGORITHM_ROTATING_ZERO_RESTART;
                case DDF_RAID5_N_CONTINUE:
-                       return ALGORITHM_LEFT_SYMMETRIC;
+                       return ALGORITHM_ROTATING_N_CONTINUE;
                default:
                        return -1;
                }
@@ -1977,7 +2002,7 @@ static int init_super_ddf_bvd(struct supertype *st,
        memset(vc->vendor, 0xff, 32);
 
        memset(vc->phys_refnum, 0xff, 4*ddf->mppe);
-       memset(vc->phys_refnum+(ddf->mppe * 4), 0x00, 8*ddf->mppe);
+       memset(vc->phys_refnum+ddf->mppe, 0x00, 8*ddf->mppe);
 
        vcl->next = ddf->conflist;
        ddf->conflist = vcl;
@@ -2131,12 +2156,12 @@ static int add_to_super_ddf(struct supertype *st,
        tm = localtime(&now);
        sprintf(dd->disk.guid, "%8s%04d%02d%02d",
                T10, tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
-       *(__u32*)(dd->disk.guid + 16) = random();
-       *(__u32*)(dd->disk.guid + 20) = random();
+       *(__u32*)(dd->disk.guid + 16) = random32();
+       *(__u32*)(dd->disk.guid + 20) = random32();
 
        do {
                /* Cannot be bothered finding a CRC of some irrelevant details*/
-               dd->disk.refnum = random();
+               dd->disk.refnum = random32();
                for (i = __be16_to_cpu(ddf->active->max_pd_entries) - 1;
                     i >= 0; i--)
                        if (ddf->phys->entries[i].refnum == dd->disk.refnum)
@@ -2734,8 +2759,14 @@ static int load_super_ddf_all(struct supertype *st, int fd,
        int seq;
        char nm[20];
        int dfd;
+       int devnum = fd2devnum(fd);
+       enum sysfs_read_flags flags;
+
+       flags = GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE;
+       if (mdmon_running(devnum))
+               flags |= SKIP_GONE_DEVS;
 
-       sra = sysfs_read(fd, 0, GET_LEVEL|GET_VERSION|GET_DEVS|GET_STATE);
+       sra = sysfs_read(fd, 0, flags);
        if (!sra)
                return 1;
        if (sra->array.major_version != -1 ||
@@ -2886,13 +2917,14 @@ static struct mdinfo *container_content_ddf(struct supertype *st)
                        if (vc->conf.phys_refnum[i] == 0xFFFFFFFF)
                                continue;
 
-                       this->array.working_disks++;
-
                        for (d = ddf->dlist; d ; d=d->next)
                                if (d->disk.refnum == vc->conf.phys_refnum[i])
                                        break;
                        if (d == NULL)
-                               break;
+                               /* Haven't found that one yet, maybe there are others */
+                               continue;
+
+                       this->array.working_disks++;
 
                        dev = malloc(sizeof(*dev));
                        memset(dev, 0, sizeof(*dev));
@@ -3531,10 +3563,28 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
 }
 #endif /* MDASSEMBLE */
 
+static int ddf_level_to_layout(int level)
+{
+       switch(level) {
+       case 0:
+       case 1:
+               return 0;
+       case 5:
+               return ALGORITHM_LEFT_SYMMETRIC;
+       case 6:
+               return ALGORITHM_ROTATING_N_CONTINUE;
+       case 10:
+               return 0x102;
+       default:
+               return UnSet;
+       }
+}
+
 struct superswitch super_ddf = {
 #ifndef        MDASSEMBLE
        .examine_super  = examine_super_ddf,
        .brief_examine_super = brief_examine_super_ddf,
+       .export_examine_super = export_examine_super_ddf,
        .detail_super   = detail_super_ddf,
        .brief_detail_super = brief_detail_super_ddf,
        .validate_geometry = validate_geometry_ddf,
@@ -3556,6 +3606,7 @@ struct superswitch super_ddf = {
        .free_super     = free_super_ddf,
        .match_metadata_desc = match_metadata_desc_ddf,
        .container_content = container_content_ddf,
+       .default_layout = ddf_level_to_layout,
 
        .external       = 1,