X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=super0.c;h=b81037ed67a08a5dcc0359ea93adcaa3ed1c9c3d;hp=4ab40af9533225da0b0bfd0e69056003e14f7d40;hb=68c7d6d790f856b4e8301d0afa7fc6873a0d4bb8;hpb=dcec9ee54779586f287f5db98ab1be3f0f02dd3f diff --git a/super0.c b/super0.c index 4ab40af9..b81037ed 100644 --- a/super0.c +++ b/super0.c @@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2004 Neil Brown + * Copyright (C) 2001-2006 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -27,9 +27,9 @@ * Australia */ +#define HAVE_STDINT_H 1 #include "mdadm.h" -#include - +#include "sha1.h" /* * All handling for the 0.90.0 version superblock is in * this file. @@ -38,7 +38,7 @@ * - initialising a new superblock * - printing the superblock for --examine * - printing part of the superblock for --detail - * .. other stuff + * .. other stuff */ @@ -56,7 +56,7 @@ static unsigned long calc_sb0_csum(mdp_super_t *super) void super0_swap_endian(struct mdp_superblock_s *sb) { /* as super0 superblocks are host-endian, it is sometimes - * useful to be able to swap the endianness + * useful to be able to swap the endianness * as (almost) everything is u32's we byte-swap every 4byte * number. * We then also have to swap the events_hi and events_lo @@ -81,11 +81,11 @@ void super0_swap_endian(struct mdp_superblock_s *sb) sb->cp_events_hi = sb->cp_events_lo; sb->cp_events_lo = t32; -} +} #ifndef MDASSEMBLE -static void examine_super0(void *sbv) +static void examine_super0(struct supertype *st, void *sbv, char *homehost) { mdp_super_t *sb = sbv; time_t atime; @@ -95,22 +95,76 @@ static void examine_super0(void *sbv) printf(" Magic : %08x\n", sb->md_magic); printf(" Version : %02d.%02d.%02d\n", sb->major_version, sb->minor_version, sb->patch_version); - if (sb->minor_version >= 90) - printf(" UUID : %08x:%08x:%08x:%08x\n", sb->set_uuid0, sb->set_uuid1, + if (sb->minor_version >= 90) { + printf(" UUID : %08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1, sb->set_uuid2, sb->set_uuid3); - else + if (homehost) { + char buf[20]; + void *hash = sha1_buffer(homehost, + strlen(homehost), + buf); + if (memcmp(&sb->set_uuid2, hash, 8)==0) + printf(" (local to host %s)", homehost); + } + printf("\n"); + } else printf(" UUID : %08x\n", sb->set_uuid0); + if (sb->not_persistent) + printf(" Eedk : not persistent\n"); + atime = sb->ctime; printf(" Creation Time : %.24s\n", ctime(&atime)); c=map_num(pers, sb->level); printf(" Raid Level : %s\n", c?c:"-unknown-"); - if ((int)sb->level >= 0) - printf(" Device Size : %d%s\n", sb->size, human_size((long long)sb->size<<10)); + if ((int)sb->level >= 0) { + int ddsks=0; + printf(" Used Dev Size : %d%s\n", sb->size, + human_size((long long)sb->size<<10)); + switch(sb->level) { + case 1: ddsks=1;break; + case 4: + case 5: ddsks = sb->raid_disks-1; break; + case 6: ddsks = sb->raid_disks-2; break; + case 10: ddsks = sb->raid_disks / (sb->layout&255) / ((sb->layout>>8)&255); + } + if (ddsks) + printf(" Array Size : %llu%s\n", (unsigned long long)ddsks * sb->size, + human_size(ddsks*(long long)sb->size<<10)); + } printf(" Raid Devices : %d\n", sb->raid_disks); printf(" Total Devices : %d\n", sb->nr_disks); printf("Preferred Minor : %d\n", sb->md_minor); printf("\n"); + if (sb->minor_version > 90 && (sb->reshape_position+1) != 0) { + printf(" Reshape pos'n : %llu%s\n", (unsigned long long)sb->reshape_position/2, human_size((long long)sb->reshape_position<<9)); + if (sb->delta_disks) { + printf(" Delta Devices : %d", sb->delta_disks); + if (sb->delta_disks) + printf(" (%d->%d)\n", sb->raid_disks-sb->delta_disks, sb->raid_disks); + else + printf(" (%d->%d)\n", sb->raid_disks, sb->raid_disks+sb->delta_disks); + } + if (sb->new_level != sb->level) { + c = map_num(pers, sb->new_level); + printf(" New Level : %s\n", c?c:"-unknown-"); + } + if (sb->new_layout != sb->layout) { + if (sb->level == 5) { + c = map_num(r5layout, sb->new_layout); + printf(" New Layout : %s\n", c?c:"-unknown-"); + } + if (sb->level == 10) { + printf(" New Layout : near=%d, %s=%d\n", + sb->new_layout&255, + (sb->new_layout&0x10000)?"offset":"far", + (sb->new_layout>>8)&255); + } + } + if (sb->new_chunk != sb->chunk_size) + printf(" New Chunksize : %d\n", sb->new_chunk); + printf("\n"); + } atime = sb->utime; printf(" Update Time : %.24s\n", ctime(&atime)); printf(" State : %s\n", @@ -132,19 +186,23 @@ static void examine_super0(void *sbv) printf(" Layout : %s\n", c?c:"-unknown-"); } if (sb->level == 10) { - printf(" Layout : near=%d, far=%d\n", - sb->layout&255, (sb->layout>>8)&255); + printf(" Layout : near=%d, %s=%d\n", + sb->layout&255, + (sb->layout&0x10000)?"offset":"far", + (sb->layout>>8)&255); } switch(sb->level) { case 0: case 4: case 5: + case 6: + case 10: printf(" Chunk Size : %dK\n", sb->chunk_size/1024); break; case -1: printf(" Rounding : %dK\n", sb->chunk_size/1024); break; - default: break; + default: break; } printf("\n"); printf(" Number Major Minor RaidDevice State\n"); @@ -166,20 +224,23 @@ static void examine_super0(void *sbv) if (dp->state & (1<state == 0) printf(" spare"); - if ((dv=map_dev(dp->major, dp->minor))) + if ((dv=map_dev(dp->major, dp->minor, 0))) printf(" %s", dv); printf("\n"); if (d == -1) printf("\n"); } } -static void brief_examine_super0(void *sbv) +static void brief_examine_super0(struct supertype *st, void *sbv) { mdp_super_t *sb = sbv; char *c=map_num(pers, sb->level); + char devname[20]; + + sprintf(devname, "/dev/md%d", sb->md_minor); printf("ARRAY %s level=%s num-devices=%d UUID=", - get_md_name(sb->md_minor), + devname, c?c:"-unknown-", sb->raid_disks); if (sb->minor_version >= 90) printf("%08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1, @@ -189,7 +250,7 @@ static void brief_examine_super0(void *sbv) printf("\n"); } -static void detail_super0(void *sbv) +static void detail_super0(struct supertype *st, void *sbv, char *homehost) { mdp_super_t *sb = sbv; printf(" UUID : "); @@ -198,10 +259,18 @@ static void detail_super0(void *sbv) sb->set_uuid2, sb->set_uuid3); else printf("%08x", sb->set_uuid0); + if (homehost) { + char buf[20]; + void *hash = sha1_buffer(homehost, + strlen(homehost), + buf); + if (memcmp(&sb->set_uuid2, hash, 8)==0) + printf(" (local to host %s)", homehost); + } printf("\n Events : %d.%d\n\n", sb->events_hi, sb->events_lo); } -static void brief_detail_super0(void *sbv) +static void brief_detail_super0(struct supertype *st, void *sbv) { mdp_super_t *sb = sbv; printf(" UUID="); @@ -211,8 +280,32 @@ static void brief_detail_super0(void *sbv) else printf("%08x", sb->set_uuid0); } + +static void export_super0(struct supertype *st, void *sbv) +{ + mdp_super_t *sb = sbv; + printf("MD_UUID="); + if (sb->minor_version >= 90) + printf("%08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1, + sb->set_uuid2, sb->set_uuid3); + else + printf("%08x", sb->set_uuid0); + printf("\n"); +} #endif -static void uuid_from_super0(int uuid[4], void * sbv) + +static int match_home0(struct supertype *st, void *sbv, char *homehost) +{ + mdp_super_t *sb = sbv; + char buf[20]; + char *hash = sha1_buffer(homehost, + strlen(homehost), + buf); + + return (memcmp(&sb->set_uuid2, hash, 8)==0); +} + +static void uuid_from_super0(struct supertype *st, int uuid[4], void * sbv) { mdp_super_t *super = sbv; uuid[0] = super->set_uuid0; @@ -227,7 +320,7 @@ static void uuid_from_super0(int uuid[4], void * sbv) } } -static void getinfo_super0(struct mdinfo *info, mddev_ident_t ident, void *sbv) +static void getinfo_super0(struct supertype *st, struct mdinfo *info, void *sbv) { mdp_super_t *sb = sbv; int working = 0; @@ -241,6 +334,10 @@ static void getinfo_super0(struct mdinfo *info, mddev_ident_t ident, void *sbv) info->array.layout = sb->layout; info->array.md_minor = sb->md_minor; info->array.ctime = sb->ctime; + info->array.utime = sb->utime; + info->array.chunk_size = sb->chunk_size; + info->array.state = sb->state; + info->component_size = sb->size*2; info->disk.state = sb->this_disk.state; info->disk.major = sb->this_disk.major; @@ -249,13 +346,25 @@ static void getinfo_super0(struct mdinfo *info, mddev_ident_t ident, void *sbv) info->disk.number = sb->this_disk.number; info->events = md_event(sb); + info->data_offset = 0; + + uuid_from_super0(st, info->uuid, sbv); - uuid_from_super0(info->uuid, sbv); + if (sb->minor_version > 90 && (sb->reshape_position+1) != 0) { + info->reshape_active = 1; + info->reshape_progress = sb->reshape_position; + info->new_level = sb->new_level; + info->delta_disks = sb->delta_disks; + info->new_layout = sb->new_layout; + info->new_chunk = sb->new_chunk; + } else + info->reshape_active = 0; - ident->name[0] = 0; + sprintf(info->name, "%d", sb->md_minor); /* work_disks is calculated rather than read directly */ for (i=0; i < MD_SB_DISKS; i++) if ((sb->disks[i].state & (1<disks[i].raid_disk < info->array.raid_disks) && (sb->disks[i].state & (1<disks[i].state & (1<nr_disks = sb->active_disks = sb->working_disks = sb->failed_disks = sb->spare_disks = 0; - for (i=0; i < MD_SB_DISKS ; i++) + for (i=0; i < MD_SB_DISKS ; i++) if (sb->disks[i].major || sb->disks[i].minor) { int state = sb->disks[i].state; @@ -314,33 +429,47 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update, char *dev } else if (i >= sb->raid_disks && sb->disks[i].number == 0) sb->disks[i].state = 0; } - if (strcmp(update, "force")==0) { + if (strcmp(update, "force-one")==0) { + /* Not enough devices for a working array, so + * bring this one up-to-date. + */ + __u32 ehi = sb->events_hi, elo = sb->events_lo; sb->events_hi = (info->events>>32) & 0xFFFFFFFF; sb->events_lo = (info->events) & 0xFFFFFFFF; - if (sb->level == 5 || sb->level == 4 || sb->level == 6) + if (sb->events_hi != ehi || + sb->events_lo != elo) + rv = 1; + } + if (strcmp(update, "force-array")==0) { + /* degraded array and 'force' requested, so + * maybe need to mark it 'clean' + */ + if ((sb->level == 5 || sb->level == 4 || sb->level == 6) && + (sb->state & (1 << MD_SB_CLEAN)) == 0) { /* need to force clean */ sb->state |= (1 << MD_SB_CLEAN); + rv = 1; + } } if (strcmp(update, "assemble")==0) { int d = info->disk.number; int wonly = sb->disks[d].state & (1<disks[d].state &= ~(1<disks[d].state != info->disk.state) { - sb->disks[d].state = info->disk.state & wonly; + if ((sb->disks[d].state & ~(1<disk.state) { + sb->disks[d].state = info->disk.state | wonly; rv = 1; } } - if (strcmp(update, "newdev") == 0) { - int d = info->disk.number; - memset(&sb->disks[d], 0, sizeof(sb->disks[d])); - sb->disks[d].number = d; - sb->disks[d].major = info->disk.major; - sb->disks[d].minor = info->disk.minor; - sb->disks[d].raid_disk = info->disk.raid_disk; - sb->disks[d].state = info->disk.state; - sb->this_disk = sb->disks[d]; - } - if (strcmp(update, "grow") == 0) { + if (strcmp(update, "linear-grow-new") == 0) { + memset(&sb->disks[info->disk.number], 0, sizeof(sb->disks[0])); + sb->disks[info->disk.number].number = info->disk.number; + sb->disks[info->disk.number].major = info->disk.major; + sb->disks[info->disk.number].minor = info->disk.minor; + sb->disks[info->disk.number].raid_disk = info->disk.raid_disk; + sb->disks[info->disk.number].state = info->disk.state; + sb->this_disk = sb->disks[info->disk.number]; + } + if (strcmp(update, "linear-grow-update") == 0) { sb->raid_disks = info->array.raid_disks; sb->nr_disks = info->array.nr_disks; sb->active_disks = info->array.active_disks; @@ -351,36 +480,64 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update, char *dev sb->disks[info->disk.number].minor = info->disk.minor; sb->disks[info->disk.number].raid_disk = info->disk.raid_disk; sb->disks[info->disk.number].state = info->disk.state; - if (sb->this_disk.number == info->disk.number) - sb->this_disk = sb->disks[info->disk.number]; } if (strcmp(update, "resync") == 0) { /* make sure resync happens */ sb->state &= ~(1<recovery_cp = 0; } + if (strcmp(update, "homehost") == 0 && + homehost) { + uuid_set = 0; + update = "uuid"; + info->uuid[0] = sb->set_uuid0; + info->uuid[1] = sb->set_uuid1; + } + if (strcmp(update, "uuid") == 0) { + if (!uuid_set && homehost) { + char buf[20]; + char *hash = sha1_buffer(homehost, + strlen(homehost), + buf); + memcpy(info->uuid+2, hash, 8); + } + sb->set_uuid0 = info->uuid[0]; + sb->set_uuid1 = info->uuid[1]; + sb->set_uuid2 = info->uuid[2]; + sb->set_uuid3 = info->uuid[3]; + if (sb->state & (1<uuid, sbv); + } + } + if (strcmp(update, "_reshape_progress")==0) + sb->reshape_position = info->reshape_progress; sb->sb_csum = calc_sb0_csum(sb); return rv; } -static __u64 event_super0(void *sbv) -{ - mdp_super_t *sb = sbv; - return md_event(sb); -} - +/* + * For verion-0 superblock, the homehost is 'stored' in the + * uuid. 8 bytes for a hash of the host leaving 8 bytes + * of random material. + * We use the first 8 bytes (64bits) of the sha1 of the + * host name + */ -static int init_super0(struct supertype *st, void **sbp, mdu_array_info_t *info, char *ignored_name) +static int init_super0(struct supertype *st, void **sbp, mdu_array_info_t *info, + unsigned long long size, char *ignored_name, char *homehost, + int *uuid) { mdp_super_t *sb = malloc(MD_SB_BYTES + sizeof(bitmap_super_t)); int spares; - int rfd; memset(sb, 0, MD_SB_BYTES + sizeof(bitmap_super_t)); if (info->major_version == -1) { /* zeroing the superblock */ + *sbp = sb; return 0; } @@ -391,28 +548,44 @@ static int init_super0(struct supertype *st, void **sbp, mdu_array_info_t *info, return 0; } - rfd = open("/dev/urandom", O_RDONLY); sb->md_magic = MD_SB_MAGIC; sb->major_version = 0; sb->minor_version = 90; sb->patch_version = 0; sb->gvalid_words = 0; /* ignored */ - if (rfd < 0 || read(rfd, &sb->set_uuid0, 4) != 4) - sb->set_uuid0 = random(); sb->ctime = time(0); sb->level = info->level; + if (size != info->size) + return 0; sb->size = info->size; sb->nr_disks = info->nr_disks; sb->raid_disks = info->raid_disks; sb->md_minor = info->md_minor; sb->not_persistent = 0; - if (rfd < 0 || read(rfd, &sb->set_uuid1, 12) != 12) { - sb->set_uuid1 = random(); - sb->set_uuid2 = random(); - sb->set_uuid3 = random(); + if (uuid) { + sb->set_uuid0 = uuid[0]; + sb->set_uuid1 = uuid[1]; + sb->set_uuid2 = uuid[2]; + sb->set_uuid3 = uuid[3]; + } else { + int rfd = open("/dev/urandom", O_RDONLY); + if (rfd < 0 || read(rfd, &sb->set_uuid0, 4) != 4) + sb->set_uuid0 = random(); + if (rfd < 0 || read(rfd, &sb->set_uuid1, 12) != 12) { + sb->set_uuid1 = random(); + sb->set_uuid2 = random(); + sb->set_uuid3 = random(); + } + if (rfd >= 0) + close(rfd); + } + if (homehost) { + char buf[20]; + char *hash = sha1_buffer(homehost, + strlen(homehost), + buf); + memcpy(&sb->set_uuid2, hash, 8); } - if (rfd >= 0) - close(rfd); sb->utime = sb->ctime; sb->state = info->state; @@ -431,11 +604,11 @@ static int init_super0(struct supertype *st, void **sbp, mdu_array_info_t *info, } /* Add a device to the superblock being created */ -static void add_to_super0(void *sbv, mdu_disk_info_t *dinfo) +static void add_to_super0(struct supertype *st, void *sbv, mdu_disk_info_t *dinfo) { mdp_super_t *sb = sbv; mdp_disk_t *dk = &sb->disks[dinfo->number]; - + dk->number = dinfo->number; dk->major = dinfo->major; dk->minor = dinfo->minor; @@ -445,24 +618,16 @@ static void add_to_super0(void *sbv, mdu_disk_info_t *dinfo) static int store_super0(struct supertype *st, int fd, void *sbv) { - unsigned long size; unsigned long long dsize; unsigned long long offset; mdp_super_t *super = sbv; - -#ifdef BLKGETSIZE64 - if (ioctl(fd, BLKGETSIZE64, &dsize) != 0) -#endif - { - if (ioctl(fd, BLKGETSIZE, &size)) - return 1; - else - dsize = ((unsigned long long)size)<<9; - } - if (dsize < MD_RESERVED_SECTORS*2) + if (!get_dev_size(fd, NULL, &dsize)) + return 1; + + if (dsize < MD_RESERVED_SECTORS*512) return 2; - + offset = MD_NEW_SIZE_SECTORS(dsize>>9); offset *= 512; @@ -473,6 +638,13 @@ static int store_super0(struct supertype *st, int fd, void *sbv) if (write(fd, super, sizeof(*super)) != sizeof(*super)) return 4; + if (super->state & (1<magic) == BITMAP_MAGIC) + if (write(fd, bm, sizeof(*bm)) != sizeof(*bm)) + return 5; + } + fsync(fd); return 0; } @@ -489,7 +661,6 @@ static int write_init_super0(struct supertype *st, void *sbv, mdu_disk_info_t *d } sb->disks[dinfo->number].state &= ~(1<disks[dinfo->number].state |= (1<this_disk = sb->disks[dinfo->number]; sb->sb_csum = calc_sb0_csum(sb); @@ -520,14 +691,14 @@ static int compare_super0(void **firstp, void *secondv) if (second->md_magic != MD_SB_MAGIC) return 1; if (!first) { - first = malloc(MD_SB_BYTES); - memcpy(first, second, MD_SB_BYTES); + first = malloc(MD_SB_BYTES + sizeof(struct bitmap_super_s)); + memcpy(first, second, MD_SB_BYTES + sizeof(struct bitmap_super_s)); *firstp = first; return 0; } - uuid_from_super0(uuid1, first); - uuid_from_super0(uuid2, second); + uuid_from_super0(NULL, uuid1, first); + uuid_from_super0(NULL, uuid2, second); if (!same_uuid(uuid1, uuid2, 0)) return 2; if (first->major_version != second->major_version || @@ -552,31 +723,23 @@ static int load_super0(struct supertype *st, int fd, void **sbp, char *devname) * 1 on cannot get superblock * 2 on superblock meaningless */ - unsigned long size; unsigned long long dsize; unsigned long long offset; mdp_super_t *super; - -#ifdef BLKGETSIZE64 - if (ioctl(fd, BLKGETSIZE64, &dsize) != 0) -#endif - { - if (ioctl(fd, BLKGETSIZE, &size)) { - if (devname) - fprintf(stderr, Name ": cannot find device size for %s: %s\n", - devname, strerror(errno)); - return 1; - } else - dsize = size << 9; - } + int uuid[4]; + struct bitmap_super_s *bsb; + + if (!get_dev_size(fd, devname, &dsize)) + return 1; - if (dsize < MD_RESERVED_SECTORS*2) { + if (dsize < MD_RESERVED_SECTORS*512) { if (devname) - fprintf(stderr, Name ": %s is too small for md: size is %ld sectors.\n", - devname, size); + fprintf(stderr, Name + ": %s is too small for md: size is %llu sectors.\n", + devname, dsize); return 1; } - + offset = MD_NEW_SIZE_SECTORS(dsize>>9); offset *= 512; @@ -625,6 +788,27 @@ static int load_super0(struct supertype *st, int fd, void **sbp, char *devname) st->max_devs = MD_SB_DISKS; } + /* Now check on the bitmap superblock */ + if ((super->state & (1<magic) != BITMAP_MAGIC || + memcmp(bsb->uuid, uuid, 16) != 0) + goto no_bitmap; + return 0; + + no_bitmap: + super->state &= ~(1< max_bits) { min_chunk *= 2; bits = (bits+1)/2; @@ -686,39 +873,30 @@ static int add_internal_bitmap0(struct supertype *st, void *sbv, int chunk, int sb->state |= (1<magic = __cpu_to_le32(BITMAP_MAGIC); bms->version = __cpu_to_le32(major); - uuid_from_super0((int*)bms->uuid, sb); + uuid_from_super0(st, (int*)bms->uuid, sb); bms->chunksize = __cpu_to_le32(chunk); bms->daemon_sleep = __cpu_to_le32(delay); - bms->sync_size = __cpu_to_le64(size<<1); + bms->sync_size = __cpu_to_le64(size); bms->write_behind = __cpu_to_le32(write_behind); - - - + *chunkp = chunk; return 1; } - + void locate_bitmap0(struct supertype *st, int fd, void *sbv) { unsigned long long dsize; - unsigned long size; unsigned long long offset; -#ifdef BLKGETSIZE64 - if (ioctl(fd, BLKGETSIZE64, &dsize) != 0) -#endif - { - if (ioctl(fd, BLKGETSIZE, &size)) - return; - else - dsize = ((unsigned long long)size)<<9; - } - if (dsize < MD_RESERVED_SECTORS*2) + if (!get_dev_size(fd, NULL, &dsize)) + return; + + if (dsize < MD_RESERVED_SECTORS*512) return; - + offset = MD_NEW_SIZE_SECTORS(dsize>>9); offset *= 512; @@ -730,29 +908,22 @@ void locate_bitmap0(struct supertype *st, int fd, void *sbv) int write_bitmap0(struct supertype *st, int fd, void *sbv) { - unsigned long size; unsigned long long dsize; unsigned long long offset; mdp_super_t *sb = sbv; - + int rv = 0; int towrite, n; char buf[4096]; -#ifdef BLKGETSIZE64 - if (ioctl(fd, BLKGETSIZE64, &dsize) != 0) -#endif - { - if (ioctl(fd, BLKGETSIZE, &size)) - return 1; - else - dsize = ((unsigned long long)size)<<9; - } + if (!get_dev_size(fd, NULL, &dsize)) + return 1; - if (dsize < MD_RESERVED_SECTORS*2) + + if (dsize < MD_RESERVED_SECTORS*512) return -1; - + offset = MD_NEW_SIZE_SECTORS(dsize>>9); offset *= 512; @@ -761,12 +932,14 @@ int write_bitmap0(struct supertype *st, int fd, void *sbv) return 3; - write(fd, ((char*)sb)+MD_SB_BYTES, sizeof(bitmap_super_t)); + if (write(fd, ((char*)sb)+MD_SB_BYTES, sizeof(bitmap_super_t)) != + sizeof(bitmap_super_t)) + return -2; towrite = 64*1024 - MD_SB_BYTES - sizeof(bitmap_super_t); memset(buf, 0xff, sizeof(buf)); while (towrite > 0) { n = towrite; - if (n > sizeof(buf)) + if (n > sizeof(buf)) n = sizeof(buf); n = write(fd, buf, n); if (n > 0) @@ -781,17 +954,24 @@ int write_bitmap0(struct supertype *st, int fd, void *sbv) return rv; } +static void free_super0(struct supertype *st, void *super) +{ + if (super) + free(super); +} + struct superswitch super0 = { #ifndef MDASSEMBLE .examine_super = examine_super0, .brief_examine_super = brief_examine_super0, .detail_super = detail_super0, .brief_detail_super = brief_detail_super0, + .export_super = export_super0, #endif + .match_home = match_home0, .uuid_from_super = uuid_from_super0, .getinfo_super = getinfo_super0, .update_super = update_super0, - .event_super = event_super0, .init_super = init_super0, .add_to_super = add_to_super0, .store_super = store_super0, @@ -803,6 +983,7 @@ struct superswitch super0 = { .add_internal_bitmap = add_internal_bitmap0, .locate_bitmap = locate_bitmap0, .write_bitmap = write_bitmap0, + .free_super = free_super0, .major = 0, .swapuuid = 0, };