d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix rebuild position broken at r245522.

Browse Source 
- Identify one more metadata field.
This commit is contained in:
Alexander Motin 2013-01-17 03:27:08 +00:00
parent e6a64a84ea
commit c3ec009a97
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/geom/raid/md_promise.c
View File

@ -126,7 +126,8 @@ struct promise_raid_conf {
uint8_t magic_6; uint8_t magic_6;
uint8_t sector_size; uint8_t sector_size;
uint16_t magic_7; uint16_t magic_7;
uint32_t magic_8[32]; uint32_t magic_8[31];
uint32_t backup_time;
uint16_t magic_9; uint16_t magic_9;
uint32_t disk_offset_high; uint32_t disk_offset_high;
uint32_t disk_sectors_high; uint32_t disk_sectors_high;
@ -228,6 +229,7 @@ g_raid_md_promise_print(struct promise_raid_conf *meta)
printf("magic_5 0x%08x\n", meta->magic_5); printf("magic_5 0x%08x\n", meta->magic_5);
printf("total_sectors_high 0x%08x\n", meta->total_sectors_high); printf("total_sectors_high 0x%08x\n", meta->total_sectors_high);
printf("sector_size %u\n", meta->sector_size); printf("sector_size %u\n", meta->sector_size);
printf("backup_time %d\n", meta->backup_time);
printf("disk_offset_high 0x%08x\n", meta->disk_offset_high); printf("disk_offset_high 0x%08x\n", meta->disk_offset_high);
printf("disk_sectors_high 0x%08x\n", meta->disk_sectors_high); printf("disk_sectors_high 0x%08x\n", meta->disk_sectors_high);
printf("disk_rebuild_high 0x%08x\n", meta->disk_rebuild_high); printf("disk_rebuild_high 0x%08x\n", meta->disk_rebuild_high);
@ -398,6 +400,7 @@ next:
meta->disk_rebuild_high = 0; meta->disk_rebuild_high = 0;
if (meta->total_sectors_high == 0x15161718) { if (meta->total_sectors_high == 0x15161718) {
meta->total_sectors_high = 0; meta->total_sectors_high = 0;
meta->backup_time = 0;
if (meta->rebuild_lba64 == 0x2122232425262728) if (meta->rebuild_lba64 == 0x2122232425262728)
meta->rebuild_lba64 = UINT64_MAX; meta->rebuild_lba64 = UINT64_MAX;
} }
@ -793,7 +796,7 @@ nofit:
sd->sd_rebuild_pos = 0; sd->sd_rebuild_pos = 0;
else { else {
sd->sd_rebuild_pos = sd->sd_rebuild_pos =
(((off_t)pd->pd_meta[sdn]->disk_rebuild << 32) + (((off_t)pd->pd_meta[sdn]->disk_rebuild_high << 32) +
pd->pd_meta[sdn]->disk_rebuild) * 512; pd->pd_meta[sdn]->disk_rebuild) * 512;
} }
} else if (!(meta->disks[md_disk_pos].flags & PROMISE_F_ONLINE)) { } else if (!(meta->disks[md_disk_pos].flags & PROMISE_F_ONLINE)) {