X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=super0.c;h=938cfd95fa25ed2fb76f723bd1b18251df95b110;hp=d69d0c049ad81d5337a1432158c91e4d0cf08e66;hb=71574efb077131701b3da874df0045f259ca3448;hpb=f80c8614b0014fde1220591fcc4a1365c9cde0c4 diff --git a/super0.c b/super0.c index d69d0c04..938cfd95 100644 --- a/super0.c +++ b/super0.c @@ -36,7 +36,6 @@ * .. other stuff */ - static unsigned long calc_sb0_csum(mdp_super_t *super) { unsigned long csum = super->sb_csum; @@ -47,7 +46,6 @@ static unsigned long calc_sb0_csum(mdp_super_t *super) return newcsum; } - static void super0_swap_endian(struct mdp_superblock_s *sb) { /* as super0 superblocks are host-endian, it is sometimes @@ -89,17 +87,17 @@ static void examine_super0(struct supertype *st, char *homehost) char *c; printf(" Magic : %08x\n", sb->md_magic); - printf(" Version : %d.%02d.%02d\n", sb->major_version, sb->minor_version, - sb->patch_version); + printf(" Version : %d.%02d.%02d\n", + sb->major_version, sb->minor_version, sb->patch_version); if (sb->minor_version >= 90) { - printf(" UUID : %08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1, - sb->set_uuid2, sb->set_uuid3); + printf(" UUID : %08x:%08x:%08x:%08x", sb->set_uuid0, + sb->set_uuid1, sb->set_uuid2, sb->set_uuid3); if (homehost) { char buf[20]; - void *hash = sha1_buffer(homehost, - strlen(homehost), - buf); - if (memcmp(&sb->set_uuid2, hash, 8)==0) + void *hash; + + hash = sha1_buffer(homehost, strlen(homehost), buf); + if (memcmp(&sb->set_uuid2, hash, 8) == 0) printf(" (local to host %s)", homehost); } printf("\n"); @@ -111,32 +109,47 @@ static void examine_super0(struct supertype *st, char *homehost) atime = sb->ctime; printf(" Creation Time : %.24s\n", ctime(&atime)); - c=map_num(pers, sb->level); + c = map_num(pers, sb->level); printf(" Raid Level : %s\n", c?c:"-unknown-"); if ((int)sb->level > 0) { - int ddsks=0; + int ddsks = 0, ddsks_denom = 1; 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 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); + case 5: + ddsks = sb->raid_disks - 1; + break; + case 6: + ddsks = sb->raid_disks - 2; + break; + case 10: + ddsks = sb->raid_disks; + ddsks_denom = + (sb->layout & 255) * ((sb->layout >> 8) & 255); + } + if (ddsks) { + long long asize = sb->size; + asize = (asize << 10) * ddsks / ddsks_denom; + printf(" Array Size : %llu%s\n", + asize >> 10, human_size(asize)); } - 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->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); - printf(" (%d->%d)\n", sb->raid_disks-sb->delta_disks, sb->raid_disks); + printf(" (%d->%d)\n", sb->raid_disks-sb->delta_disks, + sb->raid_disks); if (((int)sb->delta_disks) < 0) delta_extra = - sb->delta_disks; } @@ -147,11 +160,13 @@ static void examine_super0(struct supertype *st, char *homehost) 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-"); + printf(" New Layout : %s\n", + c?c:"-unknown-"); } if (sb->level == 6) { c = map_num(r6layout, sb->new_layout); - printf(" New Layout : %s\n", c?c:"-unknown-"); + printf(" New Layout : %s\n", + c?c:"-unknown-"); } if (sb->level == 10) { printf(" New Layout : near=%d, %s=%d\n", @@ -167,8 +182,8 @@ static void examine_super0(struct supertype *st, char *homehost) atime = sb->utime; printf(" Update Time : %.24s\n", ctime(&atime)); printf(" State : %s\n", - (sb->state&(1<state & (1<state&(1 << MD_SB_CLEAN)) ? "clean":"active"); + if (sb->state & (1 << MD_SB_BITMAP_PRESENT)) printf("Internal Bitmap : present\n"); printf(" Active Devices : %d\n", sb->active_disks); printf("Working Devices : %d\n", sb->working_disks); @@ -177,10 +192,10 @@ static void examine_super0(struct supertype *st, char *homehost) if (calc_sb0_csum(sb) == sb->sb_csum) printf(" Checksum : %x - correct\n", sb->sb_csum); else - printf(" Checksum : %x - expected %lx\n", sb->sb_csum, calc_sb0_csum(sb)); + printf(" Checksum : %x - expected %lx\n", + sb->sb_csum, calc_sb0_csum(sb)); printf(" Events : %llu\n", - ((unsigned long long)sb->events_hi << 32) - + sb->events_lo); + ((unsigned long long)sb->events_hi << 32) + sb->events_lo); printf("\n"); if (sb->level == 5) { c = map_num(r5layout, sb->layout); @@ -201,37 +216,50 @@ static void examine_super0(struct supertype *st, char *homehost) case 5: case 6: case 10: - printf(" Chunk Size : %dK\n", sb->chunk_size/1024); + printf(" Chunk Size : %dK\n", sb->chunk_size / 1024); break; case -1: - printf(" Rounding : %dK\n", sb->chunk_size/1024); + printf(" Rounding : %dK\n", sb->chunk_size / 1024); + break; + default: break; - default: break; } printf("\n"); printf(" Number Major Minor RaidDevice State\n"); - for (d= -1; d<(signed int)(sb->raid_disks+delta_extra + sb->spare_disks); d++) { + for (d = -1; + d < (signed int)(sb->raid_disks + delta_extra + sb->spare_disks); + d++) { mdp_disk_t *dp; char *dv; char nb[5]; - int wonly; + int wonly, failfast; if (d>=0) dp = &sb->disks[d]; else dp = &sb->this_disk; snprintf(nb, sizeof(nb), "%4d", d); - printf("%4s %5d %5d %5d %5d ", d < 0 ? "this" : nb, + printf("%4s %5d %5d %5d %5d ", d < 0 ? "this" : nb, dp->number, dp->major, dp->minor, dp->raid_disk); - wonly = dp->state & (1<state &= ~(1<state & (1<state & (1<state & (1<state & (1<state == 0) printf(" spare"); - if ((dv=map_dev(dp->major, dp->minor, 0))) + wonly = dp->state & (1 << MD_DISK_WRITEMOSTLY); + failfast = dp->state & (1<state &= ~(wonly | failfast); + if (dp->state & (1 << MD_DISK_FAULTY)) + printf(" faulty"); + if (dp->state & (1 << MD_DISK_ACTIVE)) + printf(" active"); + if (dp->state & (1 << MD_DISK_SYNC)) + printf(" sync"); + if (dp->state & (1 << MD_DISK_REMOVED)) + printf(" removed"); + if (wonly) + printf(" write-mostly"); + if (failfast) + printf(" failfast"); + if (dp->state == 0) + printf(" spare"); + if ((dv = map_dev(dp->major, dp->minor, 0))) printf(" %s", dv); printf("\n"); - if (d == -1) printf("\n"); + if (d == -1) + printf("\n"); } } @@ -277,6 +305,51 @@ static void export_examine_super0(struct supertype *st) + sb->events_lo); } +static int copy_metadata0(struct supertype *st, int from, int to) +{ + /* Read 64K from the appropriate offset of 'from' + * and if it looks a little like a 0.90 superblock, + * write it to the same offset of 'to' + */ + void *buf; + unsigned long long dsize, offset; + const int bufsize = 64*1024; + mdp_super_t *super; + + if (posix_memalign(&buf, 4096, bufsize) != 0) + return 1; + + if (!get_dev_size(from, NULL, &dsize)) + goto err; + + if (dsize < MD_RESERVED_SECTORS*512) + goto err; + + offset = MD_NEW_SIZE_SECTORS(dsize>>9); + + offset *= 512; + + if (lseek64(from, offset, 0) < 0LL) + goto err; + if (read(from, buf, bufsize) != bufsize) + goto err; + + if (lseek64(to, offset, 0) < 0LL) + goto err; + super = buf; + if (super->md_magic != MD_SB_MAGIC || + super->major_version != 0 || + calc_sb0_csum(super) != super->sb_csum) + goto err; + if (write(to, buf, bufsize) != bufsize) + goto err; + free(buf); + return 0; +err: + free(buf); + return 1; +} + static void detail_super0(struct supertype *st, char *homehost) { mdp_super_t *sb = st->sb; @@ -346,6 +419,7 @@ static void getinfo_super0(struct supertype *st, struct mdinfo *info, char *map) int i; int map_disks = info->array.raid_disks; + memset(info, 0, sizeof(*info)); info->array.major_version = sb->major_version; info->array.minor_version = sb->minor_version; info->array.patch_version = sb->patch_version; @@ -357,7 +431,11 @@ static void getinfo_super0(struct supertype *st, struct mdinfo *info, char *map) info->array.utime = sb->utime; info->array.chunk_size = sb->chunk_size; info->array.state = sb->state; - info->component_size = sb->size*2; + info->component_size = sb->size; + info->component_size *= 2; + + if (sb->state & (1<bitmap_offset = 8; info->disk.state = sb->this_disk.state; info->disk.major = sb->this_disk.major; @@ -386,6 +464,8 @@ static void getinfo_super0(struct supertype *st, struct mdinfo *info, char *map) } else info->reshape_active = 0; + info->recovery_blocked = info->reshape_active; + sprintf(info->name, "%d", sb->md_minor); /* work_disks is calculated rather than read directly */ for (i=0; i < MD_SB_DISKS; i++) @@ -408,7 +488,7 @@ static struct mdinfo *container_content0(struct supertype *st, char *subarray) if (subarray) return NULL; - info = malloc(sizeof(*info)); + info = xmalloc(sizeof(*info)); getinfo_super0(st, info, NULL); return info; } @@ -423,7 +503,20 @@ static int update_super0(struct supertype *st, struct mdinfo *info, * ignored. */ int rv = 0; + int uuid[4]; mdp_super_t *sb = st->sb; + + if (strcmp(update, "homehost") == 0 && + homehost) { + /* note that 'homehost' is special as it is really + * a "uuid" update. + */ + uuid_set = 0; + update = "uuid"; + info->uuid[0] = sb->set_uuid0; + info->uuid[1] = sb->set_uuid1; + } + if (strcmp(update, "sparc2.2")==0 ) { /* 2.2 sparc put the events in the wrong place * So we copy the tail of the superblock @@ -434,12 +527,12 @@ static int update_super0(struct supertype *st, struct mdinfo *info, sb32+MD_SB_GENERIC_CONSTANT_WORDS+7+1, (MD_SB_WORDS - (MD_SB_GENERIC_CONSTANT_WORDS+7+1))*4); if (verbose >= 0) - fprintf (stderr, Name ": adjusting superblock of %s for 2.2/sparc compatability.\n", - devname); + pr_err("adjusting superblock of %s for 2.2/sparc compatibility.\n", + devname); } else if (strcmp(update, "super-minor") ==0) { sb->md_minor = info->array.md_minor; if (verbose > 0) - fprintf(stderr, Name ": updating superblock of %s with minor number %d\n", + pr_err("updating superblock of %s with minor number %d\n", devname, info->array.md_minor); } else if (strcmp(update, "summaries") == 0) { unsigned int i; @@ -491,7 +584,8 @@ static int update_super0(struct supertype *st, struct mdinfo *info, } else if (strcmp(update, "assemble")==0) { int d = info->disk.number; int wonly = sb->disks[d].state & (1<disks[d].state & (1<minor_version >= 91) /* During reshape we don't insist on everything @@ -500,7 +594,21 @@ static int update_super0(struct supertype *st, struct mdinfo *info, add = (1<disks[d].state & ~mask) | add) != (unsigned)info->disk.state) { - sb->disks[d].state = info->disk.state | wonly; + sb->disks[d].state = info->disk.state | wonly |failfast; + rv = 1; + } + if (info->reshape_active && + sb->minor_version > 90 && (sb->reshape_position+1) != 0 && + info->delta_disks >= 0 && + info->reshape_progress < sb->reshape_position) { + sb->reshape_position = info->reshape_progress; + rv = 1; + } + if (info->reshape_active && + sb->minor_version > 90 && (sb->reshape_position+1) != 0 && + info->delta_disks < 0 && + info->reshape_progress > sb->reshape_position) { + sb->reshape_position = info->reshape_progress; rv = 1; } } else if (strcmp(update, "linear-grow-new") == 0) { @@ -526,12 +634,6 @@ static int update_super0(struct supertype *st, struct mdinfo *info, /* make sure resync happens */ sb->state &= ~(1<recovery_cp = 0; - } else if (strcmp(update, "homehost") == 0 && - homehost) { - uuid_set = 0; - update = "uuid"; - info->uuid[0] = sb->set_uuid0; - info->uuid[1] = sb->set_uuid1; } else if (strcmp(update, "uuid") == 0) { if (!uuid_set && homehost) { char buf[20]; @@ -547,12 +649,69 @@ static int update_super0(struct supertype *st, struct mdinfo *info, if (sb->state & (1<uuid); + uuid_from_super0(st, uuid); + memcpy(bm->uuid, uuid, 16); + } + } else if (strcmp(update, "metadata") == 0) { + /* Create some v1.0 metadata to match ours but make the + * ctime bigger. Also update info->array.*_version. + * We need to arrange that store_super writes out + * the v1.0 metadata. + * Not permitted for unclean array, or array with + * bitmap. + */ + if (info->bitmap_offset) { + pr_err("Cannot update metadata when bitmap is present\n"); + rv = -2; + } else if (info->array.state != 1) { + pr_err("Cannot update metadata on unclean array\n"); + rv = -2; + } else { + info->array.major_version = 1; + info->array.minor_version = 0; + uuid_from_super0(st, info->uuid); + st->other = super1_make_v0(st, info, st->sb); + } + } else if (strcmp(update, "revert-reshape") == 0) { + rv = -2; + if (sb->minor_version <= 90) + pr_err("No active reshape to revert on %s\n", + devname); + else if (sb->delta_disks == 0) + pr_err("%s: Can only revert reshape which changes number of devices\n", + devname); + else { + int tmp; + int parity = sb->level == 6 ? 2 : 1; + rv = 0; + + if (sb->level >= 4 && sb->level <= 6 && + sb->reshape_position % ( + sb->new_chunk/512 * + (sb->raid_disks - sb->delta_disks - parity))) { + pr_err("Reshape position is not suitably aligned.\n"); + pr_err("Try normal assembly and stop again\n"); + return -2; + } + sb->raid_disks -= sb->delta_disks; + sb->delta_disks = -sb->delta_disks; + + tmp = sb->new_layout; + sb->new_layout = sb->layout; + sb->layout = tmp; + + tmp = sb->new_chunk; + sb->new_chunk = sb->chunk_size; + sb->chunk_size = tmp; } } else if (strcmp(update, "no-bitmap") == 0) { sb->state &= ~(1<reshape_position = info->reshape_progress; + else if (strcmp(update, "writemostly")==0) + sb->state |= (1<state &= ~(1<working_disks - info->active_disks; if (info->raid_disks + spares > MD_SB_DISKS) { - fprintf(stderr, Name ": too many devices requested: %d+%d > %d\n", + pr_err("too many devices requested: %d+%d > %d\n", info->raid_disks , spares, MD_SB_DISKS); return 0; } @@ -603,9 +764,9 @@ static int init_super0(struct supertype *st, mdu_array_info_t *info, sb->gvalid_words = 0; /* ignored */ sb->ctime = time(0); sb->level = info->level; - if (size != (unsigned long long)info->size) + sb->size = size; + if (size != (unsigned long long)sb->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; @@ -616,18 +777,14 @@ static int init_super0(struct supertype *st, mdu_array_info_t *info, 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); + __u32 r[4]; + random_uuid((__u8 *)r); + sb->set_uuid0 = r[0]; + sb->set_uuid1 = r[1]; + sb->set_uuid2 = r[2]; + sb->set_uuid3 = r[3]; } - if (homehost) { + if (homehost && !uuid) { char buf[20]; char *hash = sha1_buffer(homehost, strlen(homehost), @@ -660,7 +817,7 @@ struct devinfo { #ifndef MDASSEMBLE /* Add a device to the superblock being created */ static int add_to_super0(struct supertype *st, mdu_disk_info_t *dinfo, - int fd, char *devname) + int fd, char *devname, unsigned long long data_offset) { mdp_super_t *sb = st->sb; mdp_disk_t *dk = &sb->disks[dinfo->number]; @@ -670,7 +827,8 @@ static int add_to_super0(struct supertype *st, mdu_disk_info_t *dinfo, dk->major = dinfo->major; dk->minor = dinfo->minor; dk->raid_disk = dinfo->raid_disk; - dk->state = dinfo->state; + dk->state = dinfo->state & ((1<this_disk = sb->disks[dinfo->number]; sb->sb_csum = calc_sb0_csum(sb); @@ -678,7 +836,7 @@ static int add_to_super0(struct supertype *st, mdu_disk_info_t *dinfo, dip = (struct devinfo **)&st->info; while (*dip) dip = &(*dip)->next; - di = malloc(sizeof(struct devinfo)); + di = xmalloc(sizeof(struct devinfo)); di->fd = fd; di->devname = devname; di->disk = *dinfo; @@ -701,6 +859,24 @@ static int store_super0(struct supertype *st, int fd) if (dsize < MD_RESERVED_SECTORS*512) return 2; + if (st->other) { + /* Writing out v1.0 metadata for --update=metadata */ + int ret = 0; + + offset = dsize/512 - 8*2; + offset &= ~(4*2-1); + offset *= 512; + if (lseek64(fd, offset, 0)< 0LL) + ret = 3; + else if (write(fd, st->other, 1024) != 1024) + ret = 4; + else + fsync(fd); + free(st->other); + st->other = NULL; + return ret; + } + offset = MD_NEW_SIZE_SECTORS(dsize>>9); offset *= 512; @@ -714,7 +890,7 @@ static int store_super0(struct supertype *st, int fd) if (super->state & (1<magic) == BITMAP_MAGIC) - if (write(fd, bm, ROUND_UP(sizeof(*bm),4096)) != + if (write(fd, bm, ROUND_UP(sizeof(*bm),4096)) != ROUND_UP(sizeof(*bm),4096)) return 5; } @@ -732,11 +908,11 @@ static int write_init_super0(struct supertype *st) for (di = st->info ; di && ! rv ; di = di->next) { - if (di->disk.state == 1) + if (di->disk.state & (1 << MD_DISK_FAULTY)) continue; if (di->fd == -1) continue; - while (Kill(di->devname, NULL, 0, 1, 1) == 0) + while (Kill(di->devname, NULL, 0, -1, 1) == 0) ; sb->disks[di->disk.number].state &= ~(1<fd); if (rv == 0 && (sb->state & (1<ss->write_bitmap(st, di->fd); + rv = st->ss->write_bitmap(st, di->fd, NoUpdate); if (rv) - fprintf(stderr, - Name ": failed to write superblock to %s\n", - di->devname); - close(di->fd); - di->fd = -1; + pr_err("failed to write superblock to %s\n", + di->devname); } return rv; } @@ -776,10 +949,9 @@ static int compare_super0(struct supertype *st, struct supertype *tst) return 1; if (!first) { if (posix_memalign((void**)&first, 4096, - MD_SB_BYTES + + MD_SB_BYTES + ROUND_UP(sizeof(struct bitmap_super_s), 4096)) != 0) { - fprintf(stderr, Name - ": %s could not allocate superblock\n", __func__); + pr_err("could not allocate superblock\n"); return 1; } memcpy(first, second, MD_SB_BYTES + sizeof(struct bitmap_super_s)); @@ -804,7 +976,6 @@ static int compare_super0(struct supertype *st, struct supertype *tst) return 0; } - static void free_super0(struct supertype *st); static int load_super0(struct supertype *st, int fd, char *devname) @@ -828,21 +999,19 @@ static int load_super0(struct supertype *st, int fd, char *devname) if (dsize < MD_RESERVED_SECTORS*512) { if (devname) - fprintf(stderr, Name - ": %s is too small for md: size is %llu sectors.\n", - devname, dsize); + pr_err("%s is too small for md: size is %llu sectors.\n", + devname, dsize); return 1; } + st->devsize = dsize; offset = MD_NEW_SIZE_SECTORS(dsize>>9); offset *= 512; - ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */ - if (lseek64(fd, offset, 0)< 0LL) { if (devname) - fprintf(stderr, Name ": Cannot seek to superblock on %s: %s\n", + pr_err("Cannot seek to superblock on %s: %s\n", devname, strerror(errno)); return 1; } @@ -850,14 +1019,13 @@ static int load_super0(struct supertype *st, int fd, char *devname) if (posix_memalign((void**)&super, 4096, MD_SB_BYTES + ROUND_UP(sizeof(bitmap_super_t), 4096)) != 0) { - fprintf(stderr, Name - ": %s could not allocate superblock\n", __func__); + pr_err("could not allocate superblock\n"); return 1; } if (read(fd, super, sizeof(*super)) != MD_SB_BYTES) { if (devname) - fprintf(stderr, Name ": Cannot read superblock on %s\n", + pr_err("Cannot read superblock on %s\n", devname); free(super); return 1; @@ -868,7 +1036,7 @@ static int load_super0(struct supertype *st, int fd, char *devname) if (super->md_magic != MD_SB_MAGIC) { if (devname) - fprintf(stderr, Name ": No super block found on %s (Expected magic %08x, got %08x)\n", + pr_err("No super block found on %s (Expected magic %08x, got %08x)\n", devname, MD_SB_MAGIC, super->md_magic); free(super); return 2; @@ -876,7 +1044,7 @@ static int load_super0(struct supertype *st, int fd, char *devname) if (super->major_version != 0) { if (devname) - fprintf(stderr, Name ": Cannot interpret superblock on %s - version is %d\n", + pr_err("Cannot interpret superblock on %s - version is %d\n", devname, super->major_version); free(super); return 2; @@ -916,11 +1084,9 @@ static int load_super0(struct supertype *st, int fd, char *devname) static struct supertype *match_metadata_desc0(char *arg) { - struct supertype *st = malloc(sizeof(*st)); - if (!st) return st; + struct supertype *st = xcalloc(1, sizeof(*st)); - memset(st, 0, sizeof(*st)); - st->container_dev = NoMdDev; + st->container_devnm[0] = 0; st->ss = &super0; st->info = NULL; st->minor_version = 90; @@ -951,8 +1117,11 @@ static struct supertype *match_metadata_desc0(char *arg) return NULL; } -static __u64 avail_size0(struct supertype *st, __u64 devsize) +static __u64 avail_size0(struct supertype *st, __u64 devsize, + unsigned long long data_offset) { + if (data_offset != 0 && data_offset != INVALID_SECTORS) + return 0ULL; if (devsize < MD_RESERVED_SECTORS) return 0ULL; return MD_NEW_SIZE_SECTORS(devsize); @@ -975,7 +1144,7 @@ static int add_internal_bitmap0(struct supertype *st, int *chunkp, int chunk = *chunkp; mdp_super_t *sb = st->sb; bitmap_super_t *bms = (bitmap_super_t*)(((char*)sb) + MD_SB_BYTES); - + int uuid[4]; min_chunk = 4096; /* sub-page chunks don't work yet.. */ bits = (size * 512) / min_chunk + 1; @@ -991,33 +1160,33 @@ static int add_internal_bitmap0(struct supertype *st, int *chunkp, if (chunk < 64*1024*1024) chunk = 64*1024*1024; } else if ((unsigned long long)chunk < min_chunk) - return 0; /* chunk size too small */ + return -EINVAL; /* chunk size too small */ sb->state |= (1<magic = __cpu_to_le32(BITMAP_MAGIC); bms->version = __cpu_to_le32(major); - uuid_from_super0(st, (int*)bms->uuid); + uuid_from_super0(st, uuid); + memcpy(bms->uuid, uuid, 16); bms->chunksize = __cpu_to_le32(chunk); bms->daemon_sleep = __cpu_to_le32(delay); bms->sync_size = __cpu_to_le64(size); bms->write_behind = __cpu_to_le32(write_behind); *chunkp = chunk; - return 1; + return 0; } - -static void locate_bitmap0(struct supertype *st, int fd) +static int locate_bitmap0(struct supertype *st, int fd, int node_num) { unsigned long long dsize; unsigned long long offset; if (!get_dev_size(fd, NULL, &dsize)) - return; + return -1; if (dsize < MD_RESERVED_SECTORS*512) - return; + return -1; offset = MD_NEW_SIZE_SECTORS(dsize>>9); @@ -1026,9 +1195,10 @@ static void locate_bitmap0(struct supertype *st, int fd) offset += MD_SB_BYTES; lseek64(fd, offset, 0); + return 0; } -static int write_bitmap0(struct supertype *st, int fd) +static int write_bitmap0(struct supertype *st, int fd, enum bitmap_update update) { unsigned long long dsize; unsigned long long offset; @@ -1037,13 +1207,11 @@ static int write_bitmap0(struct supertype *st, int fd) int rv = 0; int towrite, n; - char abuf[4096+4096]; - char *buf = (char*)(((long)(abuf+4096))&~4095L); + void *buf; if (!get_dev_size(fd, NULL, &dsize)) return 1; - if (dsize < MD_RESERVED_SECTORS*512) return -1; @@ -1054,6 +1222,9 @@ static int write_bitmap0(struct supertype *st, int fd) if (lseek64(fd, offset + 4096, 0)< 0LL) return 3; + if (posix_memalign(&buf, 4096, 4096)) + return -ENOMEM; + memset(buf, 0xff, 4096); memcpy(buf, ((char*)sb)+MD_SB_BYTES, sizeof(bitmap_super_t)); towrite = 60*1024; @@ -1072,6 +1243,7 @@ static int write_bitmap0(struct supertype *st, int fd) if (towrite) rv = -2; + free(buf); return rv; } @@ -1079,42 +1251,60 @@ static void free_super0(struct supertype *st) { if (st->sb) free(st->sb); + while (st->info) { + struct devinfo *di = st->info; + st->info = di->next; + if (di->fd >= 0) + close(di->fd); + free(di); + } st->sb = NULL; } #ifndef MDASSEMBLE static int validate_geometry0(struct supertype *st, int level, int layout, int raiddisks, - int chunk, unsigned long long size, + int *chunk, unsigned long long size, + unsigned long long data_offset, char *subdev, unsigned long long *freesize, int verbose) { unsigned long long ldsize; int fd; + unsigned int tbmax = 4; + + /* prior to linux 3.1, a but limits usable device size to 2TB. + * It was introduced in 2.6.29, but we won't worry about that detail + */ + if (get_linux_version() < 3001000) + tbmax = 2; if (level == LEVEL_CONTAINER) { if (verbose) - fprintf(stderr, Name ": 0.90 metadata does not support containers\n"); + pr_err("0.90 metadata does not support containers\n"); return 0; } if (raiddisks > MD_SB_DISKS) { if (verbose) - fprintf(stderr, Name ": 0.90 metadata supports at most %d devices per array\n", + pr_err("0.90 metadata supports at most %d devices per array\n", MD_SB_DISKS); return 0; } - if (size > (0x7fffffffULL<<9)) { + if (size >= tbmax * 2ULL*1024*1024*1024) { if (verbose) - fprintf(stderr, Name ": 0.90 metadata supports at most 2 terrabytes per device\n"); + pr_err("0.90 metadata supports at most %d terabytes per device\n", tbmax); return 0; } + if (*chunk == UnSet) + *chunk = DEFAULT_CHUNK; + if (!subdev) return 1; fd = open(subdev, O_RDONLY|O_EXCL, 0); if (fd < 0) { if (verbose) - fprintf(stderr, Name ": super0.90 cannot open %s: %s\n", + pr_err("super0.90 cannot open %s: %s\n", subdev, strerror(errno)); return 0; } @@ -1127,8 +1317,6 @@ static int validate_geometry0(struct supertype *st, int level, if (ldsize < MD_RESERVED_SECTORS * 512) return 0; - if (size > (0x7fffffffULL<<9)) - return 0; *freesize = MD_NEW_SIZE_SECTORS(ldsize >> 9); return 1; } @@ -1144,6 +1332,7 @@ struct superswitch super0 = { .write_init_super = write_init_super0, .validate_geometry = validate_geometry0, .add_to_super = add_to_super0, + .copy_metadata = copy_metadata0, #endif .match_home = match_home0, .uuid_from_super = uuid_from_super0,