From 2efedc7bd23b4796fcf535cb28f796b235aff9ca Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 27 Mar 2006 04:14:43 +0000 Subject: Put a 'canary' block in front of the backup .. so corruptio can be detected. Signed-off-by: Neil Brown --- Grow.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'Grow.c') diff --git a/Grow.c b/Grow.c index 736afa5..4432922 100644 --- a/Grow.c +++ b/Grow.c @@ -689,13 +689,32 @@ int Grow_reshape(char *devname, int fd, int quiet, spares = sra->spares; - /* Decide offset for the backup and llseek the spares */ + + memcpy(bsb.magic, "md_backup_data-1", 16); + st->ss->uuid_from_super((int*)&bsb.set_uuid, super); + bsb.mtime = __cpu_to_le64(time(0)); + bsb.arraystart = 0; + bsb.length = __cpu_to_le64(last_block); + + /* Decide offset for the backup, llseek the spares, and write + * a leading superblock 4K earlier. + */ for (i=array.raid_disks; icomponent_size - last_block - 8; - if (lseek64(fdlist[i], offsets[i]<<9, 0) != offsets[i]<<9) { + if (lseek64(fdlist[i], (offsets[i]<<9) - 4096, 0) + != (offsets[i]<<9) - 4096) { fprintf(stderr, Name ": could not seek...\n"); goto abort; } + memset(buf, 0, sizeof(buf)); + bsb.devstart = __cpu_to_le64(offsets[i]); + bsb.sb_csum = bsb_csum((char*)&bsb, ((char*)&bsb.sb_csum)-((char*)&bsb)); + memcpy(buf, &bsb, sizeof(bsb)); + if (write(fdlist[i], buf, 4096) != 4096) { + fprintf(stderr, Name ": could not write leading superblock\n"); + goto abort; + } } array.level = nlevel; array.raid_disks = ndisks; @@ -728,12 +747,7 @@ int Grow_reshape(char *devname, int fd, int quiet, devname); goto abort_resume; } - /* FIXME write superblocks */ - memcpy(bsb.magic, "md_backup_data-1", 16); - st->ss->uuid_from_super((int*)&bsb.set_uuid, super); - bsb.mtime = __cpu_to_le64(time(0)); - bsb.arraystart = 0; - bsb.length = __cpu_to_le64(last_block); + for (i=odisks; iarray.raid_disks); -- cgit