Remove getinfo_super_n and do some other cleaning up.

[thirdparty/mdadm.git] / super0.c

diff --git a/super0.c b/super0.c
index 1ca35368bb4f92ca8d5b4d2b7d728bef60b11588..27999d994d6fa5347abb19a5a1a4dd0ccd9051f2 100644 (file)
--- a/super0.c
+++ b/super0.c
@@ -369,6 +369,8 @@ static void getinfo_super0(struct supertype *st, struct mdinfo *info)
        info->events = md_event(sb);
        info->data_offset = 0;
 
+       sprintf(info->text_version, "0.%d", sb->minor_version);
+
        uuid_from_super0(st, info->uuid);
 
        if (sb->minor_version > 90 && (sb->reshape_position+1) != 0) {
@@ -643,6 +645,9 @@ static void add_to_super0(struct supertype *st, mdu_disk_info_t *dinfo,
        dk->raid_disk = dinfo->raid_disk;
        dk->state = dinfo->state;
 
+       sb->this_disk = sb->disks[dinfo->number];
+       sb->sb_csum = calc_sb0_csum(sb);
+
        dip = (struct devinfo **)&st->info;
        while (*dip)
                dip = &(*dip)->next;
@@ -698,6 +703,8 @@ static int write_init_super0(struct supertype *st)
 
                if (di->disk.state == 1)
                        continue;
+               if (di->fd == -1)
+                       continue;
                Kill(di->devname, 0, 1, 1);
                Kill(di->devname, 0, 1, 1);
 
@@ -779,6 +786,9 @@ static int load_super0(struct supertype *st, int fd, char *devname)
 
        free_super0(st);
 
+       if (st->subarray[0])
+               return 1;
+
        if (!get_dev_size(fd, devname, &dsize))
                return 1;
 
@@ -1085,6 +1095,4 @@ struct superswitch super0 = {
        .write_bitmap = write_bitmap0,
        .free_super = free_super0,
        .validate_geometry = validate_geometry0,
-       .major = 0,
-       .swapuuid = 0,
 };