]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super1.c
Change write_init_super to be called only once.
[thirdparty/mdadm.git] / super1.c
index effed54a9138fd04e999080f15043c9105cb5b50..211be82356d0df94913da900693dfe55aa60881d 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -142,9 +142,9 @@ static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb)
 }
 
 #ifndef MDASSEMBLE
-static void examine_super1(void *sbv, char *homehost)
+static void examine_super1(struct supertype *st, char *homehost)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        time_t atime;
        int d;
        int faulty;
@@ -152,9 +152,17 @@ static void examine_super1(void *sbv, char *homehost)
        char *c;
        int l = homehost ? strlen(homehost) : 0;
        int layout;
+       unsigned long long sb_offset;
 
        printf("          Magic : %08x\n", __le32_to_cpu(sb->magic));
-       printf("        Version : %02d\n", 1);
+       printf("        Version : 1");
+       sb_offset = __le64_to_cpu(sb->super_offset);
+       if (sb_offset <= 4)
+               printf(".1\n");
+       else if (sb_offset <= 8)
+               printf(".2\n");
+       else
+               printf(".0\n");
        printf("    Feature Map : 0x%x\n", __le32_to_cpu(sb->feature_map));
        printf("     Array UUID : ");
        for (i=0; i<16; i++) {
@@ -174,7 +182,7 @@ static void examine_super1(void *sbv, char *homehost)
        printf("     Raid Level : %s\n", c?c:"-unknown-");
        printf("   Raid Devices : %d\n", __le32_to_cpu(sb->raid_disks));
        printf("\n");
-       printf("  Used Dev Size : %llu%s\n",
+       printf(" Avail Dev Size : %llu%s\n",
               (unsigned long long)__le64_to_cpu(sb->data_size),
               human_size(__le64_to_cpu(sb->data_size)<<9));
        if (__le32_to_cpu(sb->level) >= 0) {
@@ -194,7 +202,7 @@ static void examine_super1(void *sbv, char *homehost)
                               ddsks*(unsigned long long)__le64_to_cpu(sb->size),
                               human_size(ddsks*__le64_to_cpu(sb->size)<<9));
                if (sb->size != sb->data_size)
-                       printf("      Used Size : %llu%s\n",
+                       printf("  Used Dev Size : %llu%s\n",
                               (unsigned long long)__le64_to_cpu(sb->size),
                               human_size(__le64_to_cpu(sb->size)<<9));
        }
@@ -215,7 +223,7 @@ static void examine_super1(void *sbv, char *homehost)
        printf("\n");
        if (sb->feature_map & __cpu_to_le32(MD_FEATURE_BITMAP_OFFSET)) {
                printf("Internal Bitmap : %ld sectors from superblock\n",
-                      (long)__le32_to_cpu(sb->bitmap_offset));
+                      (long)(int32_t)__le32_to_cpu(sb->bitmap_offset));
        }
        if (sb->feature_map & __le32_to_cpu(MD_FEATURE_RESHAPE_ACTIVE)) {
                printf("  Reshape pos'n : %llu%s\n", (unsigned long long)__le64_to_cpu(sb->reshape_position)/2,
@@ -333,10 +341,11 @@ static void examine_super1(void *sbv, char *homehost)
 }
 
 
-static void brief_examine_super1(void *sbv)
+static void brief_examine_super1(struct supertype *st)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        int i;
+       unsigned long long sb_offset;
        char *nm;
        char *c=map_num(pers, __le32_to_cpu(sb->level));
 
@@ -348,9 +357,15 @@ static void brief_examine_super1(void *sbv)
        else
                nm = "??";
 
-       printf("ARRAY /dev/md/%s level=%s metadata=1 num-devices=%d UUID=",
-              nm,
-              c?c:"-unknown-", __le32_to_cpu(sb->raid_disks));
+       printf("ARRAY /dev/md/%s level=%s ", nm, c?c:"-unknown-");
+       sb_offset = __le64_to_cpu(sb->super_offset);
+       if (sb_offset <= 4)
+               printf("metadata=1.1 ");
+       else if (sb_offset <= 8)
+               printf("metadata=1.2 ");
+       else
+               printf("metadata=1.0 ");
+       printf("num-devices=%d UUID=", __le32_to_cpu(sb->raid_disks));
        for (i=0; i<16; i++) {
                if ((i&3)==0 && i != 0) printf(":");
                printf("%02x", sb->set_uuid[i]);
@@ -360,9 +375,43 @@ static void brief_examine_super1(void *sbv)
        printf("\n");
 }
 
-static void detail_super1(void *sbv, char *homehost)
+static void export_examine_super1(struct supertype *st)
+{
+       struct mdp_superblock_1 *sb = st->sb;
+       int i;
+       int len = 32;
+
+       printf("MD_LEVEL=%s\n", map_num(pers, __le32_to_cpu(sb->level)));
+       printf("MD_DEVICES=%d\n", __le32_to_cpu(sb->raid_disks));
+       for (i=0; i<32; i++)
+               if (sb->set_name[i] == '\n' ||
+                   sb->set_name[i] == '\0') {
+                       len = i;
+                       break;
+               }
+       if (len)
+               printf("MD_NAME=%.*s\n", len, sb->set_name);
+       printf("MD_UUID=");
+       for (i=0; i<16; i++) {
+               if ((i&3)==0 && i != 0) printf(":");
+               printf("%02x", sb->set_uuid[i]);
+       }
+       printf("\n");
+       printf("MD_UPDATE_TIME=%llu\n",
+              __le64_to_cpu(sb->utime) & 0xFFFFFFFFFFULL);
+       printf("MD_DEV_UUID=");
+       for (i=0; i<16; i++) {
+               if ((i&3)==0 && i != 0) printf(":");
+               printf("%02x", sb->device_uuid[i]);
+       }
+       printf("\n");
+       printf("MD_EVENTS=%llu\n",
+              (unsigned long long)__le64_to_cpu(sb->events));
+}
+
+static void detail_super1(struct supertype *st, char *homehost)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        int i;
        int l = homehost ? strlen(homehost) : 0;
 
@@ -379,9 +428,9 @@ static void detail_super1(void *sbv, char *homehost)
        printf("\n         Events : %llu\n\n", (unsigned long long)__le64_to_cpu(sb->events));
 }
 
-static void brief_detail_super1(void *sbv)
+static void brief_detail_super1(struct supertype *st)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        int i;
 
        if (sb->set_name[0])
@@ -393,11 +442,33 @@ static void brief_detail_super1(void *sbv)
        }
 }
 
+static void export_detail_super1(struct supertype *st)
+{
+       struct mdp_superblock_1 *sb = st->sb;
+       int i;
+       int len = 32;
+
+       for (i=0; i<32; i++)
+               if (sb->set_name[i] == '\n' ||
+                   sb->set_name[i] == '\0') {
+                       len = i;
+                       break;
+               }
+       if (len)
+               printf("MD_NAME=%.*s\n", len, sb->set_name);
+       printf("MD_UUID=");
+       for (i=0; i<16; i++) {
+               if ((i&3)==0 && i != 0) printf(":");
+               printf("%02x", sb->set_uuid[i]);
+       }
+       printf("\n");
+}
+
 #endif
 
-static int match_home1(void *sbv, char *homehost)
+static int match_home1(struct supertype *st, char *homehost)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        int l = homehost ? strlen(homehost) : 0;
 
        return (l > 0 && l < 32 &&
@@ -405,18 +476,18 @@ static int match_home1(void *sbv, char *homehost)
                strncmp(sb->set_name, homehost, l) == 0);
 }
 
-static void uuid_from_super1(int uuid[4], void * sbv)
+static void uuid_from_super1(struct supertype *st, int uuid[4])
 {
-       struct mdp_superblock_1 *super = sbv;
+       struct mdp_superblock_1 *super = st->sb;
        char *cuuid = (char*)uuid;
        int i;
        for (i=0; i<16; i++)
                cuuid[i] = super->set_uuid[i];
 }
 
-static void getinfo_super1(struct mdinfo *info, void *sbv)
+static void getinfo_super1(struct supertype *st, struct mdinfo *info)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        int working = 0;
        int i;
        int role;
@@ -485,7 +556,8 @@ static void getinfo_super1(struct mdinfo *info, void *sbv)
        info->array.working_disks = working;
 }
 
-static int update_super1(struct mdinfo *info, void *sbv, char *update,
+static int update_super1(struct supertype *st, struct mdinfo *info,
+                        char *update,
                         char *devname, int verbose,
                         int uuid_set, char *homehost)
 {
@@ -493,7 +565,7 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update,
         * For others, the return value is ignored.
         */
        int rv = 0;
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
 
        if (strcmp(update, "force-one")==0) {
                /* Not enough devices for a working array,
@@ -527,11 +599,34 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update,
                        rv = 1;
                }
        }
-       if (strcmp(update, "grow") == 0) {
+       if (strcmp(update, "linear-grow-new") == 0) {
+               int i;
+               int rfd;
+               int max = __le32_to_cpu(sb->max_dev);
+
+               for (i=0 ; i < max ; i++)
+                       if (__le16_to_cpu(sb->dev_roles[i]) >= 0xfffe)
+                               break;
+               sb->dev_number = __cpu_to_le32(i);
+               info->disk.number = i;
+               if (max >= __le32_to_cpu(sb->max_dev))
+                       sb->max_dev = __cpu_to_le32(max+1);
+
+               if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
+                   read(rfd, sb->device_uuid, 16) != 16) {
+                       *(__u32*)(sb->device_uuid) = random();
+                       *(__u32*)(sb->device_uuid+4) = random();
+                       *(__u32*)(sb->device_uuid+8) = random();
+                       *(__u32*)(sb->device_uuid+12) = random();
+               }
+
+               sb->dev_roles[i] =
+                       __cpu_to_le16(info->disk.raid_disk);
+       }
+       if (strcmp(update, "linear-grow-update") == 0) {
                sb->raid_disks = __cpu_to_le32(info->array.raid_disks);
-               /* As we are just adding a spare, there is no need to
-                * make any change to the dev_roles array
-                */
+               sb->dev_roles[info->disk.number] =
+                       __cpu_to_le16(info->disk.raid_disk);
        }
        if (strcmp(update, "resync") == 0) {
                /* make sure resync happens */
@@ -542,7 +637,7 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update,
 
                if (__le32_to_cpu(sb->feature_map)&MD_FEATURE_BITMAP_OFFSET) {
                        struct bitmap_super_s *bm;
-                       bm = (struct bitmap_super_s*)(sbv+1024);
+                       bm = (struct bitmap_super_s*)(st->sb+1024);
                        memcpy(bm->uuid, sb->set_uuid, 16);
                }
        }
@@ -575,7 +670,7 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update,
            __le64_to_cpu(sb->data_offset)) {
                /* set data_size to device size less data_offset */
                struct misc_dev_info *misc = (struct misc_dev_info*)
-                       (sbv + 1024 + sizeof(struct bitmap_super_s));
+                       (st->sb + 1024 + sizeof(struct bitmap_super_s));
                printf("Size was %llu\n", (unsigned long long)
                       __le64_to_cpu(sb->data_size));
                sb->data_size = __cpu_to_le64(
@@ -590,7 +685,7 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update,
        return rv;
 }
 
-static int init_super1(struct supertype *st, void **sbp, mdu_array_info_t *info,
+static int init_super1(struct supertype *st, mdu_array_info_t *info,
                       unsigned long long size, char *name, char *homehost, int *uuid)
 {
        struct mdp_superblock_1 *sb = malloc(1024 + sizeof(bitmap_super_t) +
@@ -600,9 +695,9 @@ static int init_super1(struct supertype *st, void **sbp, mdu_array_info_t *info,
        char defname[10];
        memset(sb, 0, 1024);
 
+       st->sb = sb;
        if (info->major_version == -1) {
                /* zeroing superblock */
-               *sbp = sb;
                return 0;
        }
 
@@ -669,28 +764,46 @@ static int init_super1(struct supertype *st, void **sbp, mdu_array_info_t *info,
 
        memset(sb->dev_roles, 0xff, 1024 - sizeof(struct mdp_superblock_1));
 
-       *sbp = sb;
        return 1;
 }
 
+struct devinfo {
+       int fd;
+       char *devname;
+       mdu_disk_info_t disk;
+       struct devinfo *next;
+};
 /* Add a device to the superblock being created */
-static void add_to_super1(void *sbv, mdu_disk_info_t *dk)
+static void add_to_super1(struct supertype *st, mdu_disk_info_t *dk,
+                         int fd, char *devname)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        __u16 *rp = sb->dev_roles + dk->number;
+       struct devinfo *di, **dip;
+
        if ((dk->state & 6) == 6) /* active, sync */
                *rp = __cpu_to_le16(dk->raid_disk);
        else if ((dk->state & ~2) == 0) /* active or idle -> spare */
                *rp = 0xffff;
        else
                *rp = 0xfffe;
+
+       dip = (struct devinfo **)&st->info;
+       while (*dip)
+               dip = &(*dip)->next;
+       di = malloc(sizeof(struct devinfo));
+       di->fd = fd;
+       di->devname = devname;
+       di->disk = *dk;
+       di->next = NULL;
+       *dip = di;
 }
 
-static void locate_bitmap1(struct supertype *st, int fd, void *sbv);
+static void locate_bitmap1(struct supertype *st, int fd);
 
-static int store_super1(struct supertype *st, int fd, void *sbv)
+static int store_super1(struct supertype *st, int fd)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        unsigned long long sb_offset;
        int sbsize;
        unsigned long long dsize;
@@ -748,7 +861,7 @@ static int store_super1(struct supertype *st, int fd, void *sbv)
                struct bitmap_super_s *bm = (struct bitmap_super_s*)
                        (((char*)sb)+1024);
                if (__le32_to_cpu(bm->magic) == BITMAP_MAGIC) {
-                       locate_bitmap1(st, fd, sbv);
+                       locate_bitmap1(st, fd);
                        if (write(fd, bm, sizeof(*bm)) != sizeof(*bm))
                            return 5;
                }
@@ -757,13 +870,14 @@ static int store_super1(struct supertype *st, int fd, void *sbv)
        return 0;
 }
 
-static int load_super1(struct supertype *st, int fd, void **sbp, char *devname);
+static int load_super1(struct supertype *st, int fd, char *devname);
 
 static unsigned long choose_bm_space(unsigned long devsize)
 {
        /* if the device is bigger than 8Gig, save 64k for bitmap usage,
         * if bigger than 200Gig, save 128k
         */
+       if (devsize < 64*2) return 0;
        if (devsize - 64*2 >= 200*1024*1024*2)
                return 128*2;
        if (devsize - 4*2 > 8*1024*1024*2)
@@ -771,117 +885,139 @@ static unsigned long choose_bm_space(unsigned long devsize)
        return 4*2;
 }
 
-static int write_init_super1(struct supertype *st, void *sbv,
-                            mdu_disk_info_t *dinfo, char *devname)
+#ifndef MDASSEMBLE
+static int write_init_super1(struct supertype *st)
 {
-       struct mdp_superblock_1 *sb = sbv;
-       void *refsbv = NULL;
-       int fd = open(devname, O_RDWR | O_EXCL);
+       struct mdp_superblock_1 *sb = st->sb;
+       struct supertype refst;
        int rfd;
-       int rv;
+       int rv = 0;
        int bm_space;
-
+       struct devinfo *di;
        unsigned long long dsize, array_size;
        long long sb_offset;
 
+       for (di = st->info; di && ! rv ; di = di->next) {
+               if (di->disk.state == 1)
+                       continue;
 
-       if (fd < 0) {
-               fprintf(stderr, Name ": Failed to open %s to write superblock\n",
-                       devname);
-               return -1;
-       }
+               Kill(di->devname, 0, 1, 1);
+               Kill(di->devname, 0, 1, 1);
 
-       sb->dev_number = __cpu_to_le32(dinfo->number);
-       if (dinfo->state & (1<<MD_DISK_WRITEMOSTLY))
-               sb->devflags |= __cpu_to_le32(WriteMostly1);
+               if (di->fd < 0) {
+                       fprintf(stderr,
+                               Name": Failed to open %s to write superblock\n",
+                               di->devname);
+                       return -1;
+               }
+               sb->dev_number = __cpu_to_le32(di->disk.number);
+               if (di->disk.state & (1<<MD_DISK_WRITEMOSTLY))
+                       sb->devflags |= __cpu_to_le32(WriteMostly1);
 
-       if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
-           read(rfd, sb->device_uuid, 16) != 16) {
-               *(__u32*)(sb->device_uuid) = random();
-               *(__u32*)(sb->device_uuid+4) = random();
-               *(__u32*)(sb->device_uuid+8) = random();
-               *(__u32*)(sb->device_uuid+12) = random();
-       }
-       if (rfd >= 0) close(rfd);
-       sb->events = 0;
-
-       if (load_super1(st, fd, &refsbv, NULL)==0) {
-               struct mdp_superblock_1 *refsb = refsbv;
-
-               memcpy(sb->device_uuid, refsb->device_uuid, 16);
-               if (memcmp(sb->set_uuid, refsb->set_uuid, 16)==0) {
-                       /* same array, so preserve events and dev_number */
-                       sb->events = refsb->events;
-                       /* bugs in 2.6.17 and earlier mean the dev_number
-                        * chosen in Manage must be preserved
-                        */
-                       if (get_linux_version() >= 2006018)
-                               sb->dev_number = refsb->dev_number;
+               if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
+                   read(rfd, sb->device_uuid, 16) != 16) {
+                       *(__u32*)(sb->device_uuid) = random();
+                       *(__u32*)(sb->device_uuid+4) = random();
+                       *(__u32*)(sb->device_uuid+8) = random();
+                       *(__u32*)(sb->device_uuid+12) = random();
+               }
+               if (rfd >= 0) close(rfd);
+               sb->events = 0;
+
+               refst =*st;
+               refst.sb = NULL;
+               if (load_super1(&refst, di->fd, NULL)==0) {
+                       struct mdp_superblock_1 *refsb = refst.sb;
+
+                       memcpy(sb->device_uuid, refsb->device_uuid, 16);
+                       if (memcmp(sb->set_uuid, refsb->set_uuid, 16)==0) {
+                               /* same array, so preserve events and
+                                * dev_number */
+                               sb->events = refsb->events;
+                               /* bugs in 2.6.17 and earlier mean the
+                                * dev_number chosen in Manage must be preserved
+                                */
+                               if (get_linux_version() >= 2006018)
+                                       sb->dev_number = refsb->dev_number;
+                       }
+                       free(refsb);
                }
-               free(refsb);
-       }
 
-       if (!get_dev_size(fd, NULL, &dsize))
-               return 1;
-       dsize >>= 9;
-
-       if (dsize < 24) {
-               close(fd);
-               return 2;
-       }
+               if (!get_dev_size(di->fd, NULL, &dsize))
+                       return 1;
+               dsize >>= 9;
 
+               if (dsize < 24) {
+                       close(di->fd);
+                       return 2;
+               }
 
-       /*
-        * Calculate the position of the superblock.
-        * It is always aligned to a 4K boundary and
-        * depending on minor_version, it can be:
-        * 0: At least 8K, but less than 12K, from end of device
-        * 1: At start of device
-        * 2: 4K from start of device.
-        * Depending on the array size, we might leave extra space
-        * for a bitmap.
-        */
-       array_size = __le64_to_cpu(sb->size);
-       /* work out how much space we left of a bitmap */
-       bm_space = choose_bm_space(array_size);
 
-       switch(st->minor_version) {
-       case 0:
-               sb_offset = dsize;
-               sb_offset -= 8*2;
-               sb_offset &= ~(4*2-1);
-               sb->super_offset = __cpu_to_le64(sb_offset);
-               sb->data_offset = __cpu_to_le64(0);
-               sb->data_size = __cpu_to_le64(sb_offset - bm_space);
-               break;
-       case 1:
-               sb->super_offset = __cpu_to_le64(0);
-               sb->data_offset = __cpu_to_le64(bm_space + 4*2);
-               sb->data_size = __cpu_to_le64(dsize - bm_space - 4*2);
-               break;
-       case 2:
-               sb_offset = 4*2;
-               sb->super_offset = __cpu_to_le64(4*2);
-               sb->data_offset = __cpu_to_le64(4*2 + 4*2 + bm_space);
-               sb->data_size = __cpu_to_le64(dsize - 4*2 - 4*2 - bm_space );
-               break;
-       default:
-               return -EINVAL;
-       }
+               /*
+                * Calculate the position of the superblock.
+                * It is always aligned to a 4K boundary and
+                * depending on minor_version, it can be:
+                * 0: At least 8K, but less than 12K, from end of device
+                * 1: At start of device
+                * 2: 4K from start of device.
+                * Depending on the array size, we might leave extra space
+                * for a bitmap.
+                */
+               array_size = __le64_to_cpu(sb->size);
+               /* work out how much space we left for a bitmap */
+               bm_space = choose_bm_space(array_size);
+
+               switch(st->minor_version) {
+               case 0:
+                       sb_offset = dsize;
+                       sb_offset -= 8*2;
+                       sb_offset &= ~(4*2-1);
+                       sb->super_offset = __cpu_to_le64(sb_offset);
+                       sb->data_offset = __cpu_to_le64(0);
+               if (sb_offset - bm_space < array_size)
+                       bm_space = sb_offset - array_size;
+                       sb->data_size = __cpu_to_le64(sb_offset - bm_space);
+                       break;
+               case 1:
+                       sb->super_offset = __cpu_to_le64(0);
+                       if (4*2 + bm_space + __le64_to_cpu(sb->size) > dsize)
+                               bm_space = dsize - __le64_to_cpu(sb->size) -4*2;
+                       sb->data_offset = __cpu_to_le64(bm_space + 4*2);
+                       sb->data_size = __cpu_to_le64(dsize - bm_space - 4*2);
+                       break;
+               case 2:
+                       sb_offset = 4*2;
+                       sb->super_offset = __cpu_to_le64(4*2);
+                       if (4*2 + 4*2 + bm_space + __le64_to_cpu(sb->size)
+                           > dsize)
+                               bm_space = dsize - __le64_to_cpu(sb->size)
+                                       - 4*2 - 4*2;
+                       sb->data_offset = __cpu_to_le64(4*2 + 4*2 + bm_space);
+                       sb->data_size = __cpu_to_le64(dsize - 4*2 - 4*2
+                                                     - bm_space );
+                       break;
+               default:
+                       return -EINVAL;
+               }
 
 
-       sb->sb_csum = calc_sb_1_csum(sb);
-       rv = store_super1(st, fd, sb);
-       if (rv)
-               fprintf(stderr, Name ": failed to write superblock to %s\n", devname);
+               sb->sb_csum = calc_sb_1_csum(sb);
+               rv = store_super1(st, di->fd);
+               if (rv)
+                       fprintf(stderr,
+                               Name ": failed to write superblock to %s\n",
+                               di->devname);
 
-       if (rv == 0 && (__le32_to_cpu(sb->feature_map) & 1))
-               rv = st->ss->write_bitmap(st, fd, sbv);
-       close(fd);
+               if (rv == 0 && (__le32_to_cpu(sb->feature_map) & 1))
+                       rv = st->ss->write_bitmap(st, di->fd);
+               close(di->fd);
+               di->fd = -1;
+       }
        return rv;
 }
+#endif
 
-static int compare_super1(void **firstp, void *secondv)
+static int compare_super1(struct supertype *st, struct supertype *tst)
 {
        /*
         * return:
@@ -890,8 +1026,8 @@ static int compare_super1(void **firstp, void *secondv)
         *  2 wrong uuid
         *  3 wrong other info
         */
-       struct mdp_superblock_1 *first = *firstp;
-       struct mdp_superblock_1 *second = secondv;
+       struct mdp_superblock_1 *first = st->sb;
+       struct mdp_superblock_1 *second = tst->sb;
 
        if (second->magic != __cpu_to_le32(MD_SB_MAGIC))
                return 1;
@@ -903,7 +1039,7 @@ static int compare_super1(void **firstp, void *secondv)
                               sizeof(struct misc_dev_info));
                memcpy(first, second, 1024+sizeof(bitmap_super_t) +
                       sizeof(struct misc_dev_info));
-               *firstp = first;
+               st->sb = first;
                return 0;
        }
        if (memcmp(first->set_uuid, second->set_uuid, 16)!= 0)
@@ -919,7 +1055,9 @@ static int compare_super1(void **firstp, void *secondv)
        return 0;
 }
 
-static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
+static void free_super1(struct supertype *st);
+
+static int load_super1(struct supertype *st, int fd, char *devname)
 {
        unsigned long long dsize;
        unsigned long long sb_offset;
@@ -928,37 +1066,40 @@ static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
        struct bitmap_super_s *bsb;
        struct misc_dev_info *misc;
 
+       free_super1(st);
 
-       if (st->ss == NULL) {
+       if (st->ss == NULL || st->minor_version == -1) {
                int bestvers = -1;
+               struct supertype tst;
                __u64 bestctime = 0;
                /* guess... choose latest ctime */
-               st->ss = &super1;
-               for (st->minor_version = 0; st->minor_version <= 2 ; st->minor_version++) {
-                       switch(load_super1(st, fd, sbp, devname)) {
-                       case 0: super = *sbp;
+               tst.ss = &super1;
+               tst.sb = NULL;
+               for (tst.minor_version = 0; tst.minor_version <= 2 ; tst.minor_version++) {
+                       switch(load_super1(&tst, fd, devname)) {
+                       case 0: super = tst.sb;
                                if (bestvers == -1 ||
                                    bestctime < __le64_to_cpu(super->ctime)) {
-                                       bestvers = st->minor_version;
+                                       bestvers = tst.minor_version;
                                        bestctime = __le64_to_cpu(super->ctime);
                                }
                                free(super);
-                               *sbp = NULL;
+                               tst.sb = NULL;
                                break;
-                       case 1: st->ss = NULL; return 1; /*bad device */
+                       case 1: return 1; /*bad device */
                        case 2: break; /* bad, try next */
                        }
                }
                if (bestvers != -1) {
                        int rv;
-                       st->minor_version = bestvers;
-                       st->ss = &super1;
-                       st->max_devs = 384;
-                       rv = load_super1(st, fd, sbp, devname);
-                       if (rv) st->ss = NULL;
+                       tst.minor_version = bestvers;
+                       tst.ss = &super1;
+                       tst.max_devs = 384;
+                       rv = load_super1(&tst, fd, devname);
+                       if (rv == 0)
+                               *st = tst;
                        return rv;
                }
-               st->ss = NULL;
                return 2;
        }
        if (!get_dev_size(fd, devname, &dsize))
@@ -1039,7 +1180,7 @@ static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
                free(super);
                return 2;
        }
-       *sbp = super;
+       st->sb = super;
 
        bsb = (struct bitmap_super_s *)(((char*)super)+1024);
 
@@ -1053,12 +1194,12 @@ static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
         * valid.  If it doesn't clear the bit.  An --assemble --force
         * should get that written out.
         */
-       locate_bitmap1(st, fd, super);
+       locate_bitmap1(st, fd);
        if (read(fd, ((char*)super)+1024, sizeof(struct bitmap_super_s))
            != sizeof(struct bitmap_super_s))
                goto no_bitmap;
 
-       uuid_from_super1(uuid, super);
+       uuid_from_super1(st, uuid);
        if (__le32_to_cpu(bsb->magic) != BITMAP_MAGIC ||
            memcmp(bsb->uuid, uuid, 16) != 0)
                goto no_bitmap;
@@ -1077,9 +1218,8 @@ static struct supertype *match_metadata_desc1(char *arg)
 
        st->ss = &super1;
        st->max_devs = 384;
-       if (strcmp(arg, "1") == 0 ||
-           strcmp(arg, "1.0") == 0 ||
-           strcmp(arg, "default/large") == 0) {
+       st->sb = NULL;
+       if (strcmp(arg, "1.0") == 0) {
                st->minor_version = 0;
                return st;
        }
@@ -1091,6 +1231,11 @@ static struct supertype *match_metadata_desc1(char *arg)
                st->minor_version = 2;
                return st;
        }
+       if (strcmp(arg, "1") == 0 ||
+           strcmp(arg, "default") == 0) {
+               st->minor_version = -1;
+               return st;
+       }
 
        free(st);
        return NULL;
@@ -1108,6 +1253,9 @@ static __u64 avail_size1(struct supertype *st, __u64 devsize)
        devsize -= choose_bm_space(devsize);
 
        switch(st->minor_version) {
+       case -1: /* no specified.  Now time to set default */
+               st->minor_version = 0;
+               /* FALL THROUGH */
        case 0:
                /* at end */
                return ((devsize - 8*2 ) & ~(4*2-1));
@@ -1122,7 +1270,7 @@ static __u64 avail_size1(struct supertype *st, __u64 devsize)
 }
 
 static int
-add_internal_bitmap1(struct supertype *st, void *sbv,
+add_internal_bitmap1(struct supertype *st,
                     int *chunkp, int delay, int write_behind,
                     unsigned long long size,
                     int may_change, int major)
@@ -1144,7 +1292,7 @@ add_internal_bitmap1(struct supertype *st, void *sbv,
        long offset;
        int chunk = *chunkp;
        int room = 0;
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        bitmap_super_t *bms = (bitmap_super_t*)(((char*)sb) + 1024);
 
        switch(st->minor_version) {
@@ -1229,7 +1377,7 @@ add_internal_bitmap1(struct supertype *st, void *sbv,
        memset(bms, 0, sizeof(*bms));
        bms->magic = __cpu_to_le32(BITMAP_MAGIC);
        bms->version = __cpu_to_le32(major);
-       uuid_from_super1((int*)bms->uuid, sb);
+       uuid_from_super1(st, (int*)bms->uuid);
        bms->chunksize = __cpu_to_le32(chunk);
        bms->daemon_sleep = __cpu_to_le32(delay);
        bms->sync_size = __cpu_to_le64(size);
@@ -1240,36 +1388,36 @@ add_internal_bitmap1(struct supertype *st, void *sbv,
 }
 
 
-static void locate_bitmap1(struct supertype *st, int fd, void *sbv)
+static void locate_bitmap1(struct supertype *st, int fd)
 {
        unsigned long long offset;
        struct mdp_superblock_1 *sb;
        int mustfree = 0;
 
-       if (!sbv) {
-               if (st->ss->load_super(st, fd, &sbv, NULL))
+       if (!st->sb) {
+               if (st->ss->load_super(st, fd, NULL))
                        return; /* no error I hope... */
                mustfree = 1;
        }
-       sb = sbv;
+       sb = st->sb;
 
        offset = __le64_to_cpu(sb->super_offset);
-       offset += (long) __le32_to_cpu(sb->bitmap_offset);
+       offset += (int32_t) __le32_to_cpu(sb->bitmap_offset);
        if (mustfree)
                free(sb);
        lseek64(fd, offset<<9, 0);
 }
 
-static int write_bitmap1(struct supertype *st, int fd, void *sbv)
+static int write_bitmap1(struct supertype *st, int fd)
 {
-       struct mdp_superblock_1 *sb = sbv;
+       struct mdp_superblock_1 *sb = st->sb;
        bitmap_super_t *bms = (bitmap_super_t*)(((char*)sb)+1024);
        int rv = 0;
 
        int towrite, n;
        char buf[4096];
 
-       locate_bitmap1(st, fd, sbv);
+       locate_bitmap1(st, fd);
 
        if (write(fd, ((char*)sb)+1024, sizeof(bitmap_super_t)) !=
            sizeof(bitmap_super_t))
@@ -1294,12 +1442,51 @@ static int write_bitmap1(struct supertype *st, int fd, void *sbv)
        return rv;
 }
 
+static void free_super1(struct supertype *st)
+{
+       if (st->sb)
+               free(st->sb);
+       st->sb = NULL;
+}
+
+static int validate_geometry1(struct supertype *st, int level,
+                             int layout, int raiddisks,
+                             int chunk, unsigned long long size,
+                             char *subdev, unsigned long long *freesize)
+{
+       unsigned long long ldsize;
+       int fd;
+
+       if (level == LEVEL_CONTAINER)
+               return 0;
+       if (!subdev)
+               return 1;
+
+       fd = open(subdev, O_RDONLY|O_EXCL, 0);
+       if (fd < 0) {
+               fprintf(stderr, Name ": Cannot open %s: %s\n",
+                       subdev, strerror(errno));
+               return 0;
+       }
+       if (!get_dev_size(fd, subdev, &ldsize)) {
+               close(fd);
+               return 0;
+       }
+       close(fd);
+
+       *freesize = avail_size1(st, ldsize >> 9);
+       return 1;
+}
+
 struct superswitch super1 = {
 #ifndef MDASSEMBLE
        .examine_super = examine_super1,
        .brief_examine_super = brief_examine_super1,
+       .export_examine_super = export_examine_super1,
        .detail_super = detail_super1,
        .brief_detail_super = brief_detail_super1,
+       .export_detail_super = export_detail_super1,
+       .write_init_super = write_init_super1,
 #endif
        .match_home = match_home1,
        .uuid_from_super = uuid_from_super1,
@@ -1308,7 +1495,6 @@ struct superswitch super1 = {
        .init_super = init_super1,
        .add_to_super = add_to_super1,
        .store_super = store_super1,
-       .write_init_super = write_init_super1,
        .compare_super = compare_super1,
        .load_super = load_super1,
        .match_metadata_desc = match_metadata_desc1,
@@ -1316,6 +1502,8 @@ struct superswitch super1 = {
        .add_internal_bitmap = add_internal_bitmap1,
        .locate_bitmap = locate_bitmap1,
        .write_bitmap = write_bitmap1,
+       .free_super = free_super1,
+       .validate_geometry = validate_geometry1,
        .major = 1,
 #if __BYTE_ORDER == BIG_ENDIAN
        .swapuuid = 0,