luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Linux Raid md size detection to use 512-bytes sector size

Browse source
This commit is contained in:
Christophe Grenier 2016-06-05 10:09:17 +02:00
parent 365499b706
commit 90c2feebe3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/md.c
View file

@ -206,14 +206,14 @@ int recover_MD(disk_t *disk_car, const struct mdp_superblock_s *sb, partition_t
partition->part_type_gpt=GPT_ENT_TYPE_LINUX_RAID;
if(le32(sb->major_version)==0)
{
partition->part_size=(uint64_t)(le32(sb->size)<<1)*disk_car->sector_size+MD_RESERVED_BYTES;
partition->part_size=(uint64_t)(le32(sb->size)<<1)*512+MD_RESERVED_BYTES; /* 512-byte sectors */
memcpy(&partition->part_uuid, &sb->set_uuid0, 4);
memcpy((char*)(&partition->part_uuid)+4, &sb->set_uuid1, 3*4);
}
else
{
const struct mdp_superblock_1 *sb1=(const struct mdp_superblock_1 *)sb;
partition->part_size=(uint64_t)le64(sb1->size) * (uint64_t)disk_car->sector_size+4096;
partition->part_size=(uint64_t)le64(sb1->size) * 512 + 4096; /* 512-byte sectors */
memcpy(&partition->part_uuid, &sb1->set_uuid, 16);
}
return 0;
@ -226,14 +226,14 @@ int recover_MD(disk_t *disk_car, const struct mdp_superblock_s *sb, partition_t
partition->part_type_gpt=GPT_ENT_TYPE_LINUX_RAID;
if(be32(sb->major_version)==0)
{
partition->part_size=(uint64_t)(be32(sb->size)<<1)*disk_car->sector_size+MD_RESERVED_BYTES;
partition->part_size=(uint64_t)(be32(sb->size)<<1)*512+MD_RESERVED_BYTES; /* 512-byte sectors */
memcpy(&partition->part_uuid, &sb->set_uuid0, 4);
memcpy((char*)(&partition->part_uuid)+4, &sb->set_uuid1, 3*4);
}
else
{
const struct mdp_superblock_1 *sb1=(const struct mdp_superblock_1 *)sb;
partition->part_size=(uint64_t)be64(sb1->size) * (uint64_t)disk_car->sector_size+4096;
partition->part_size=(uint64_t)be64(sb1->size) * 512 + 4096; /* 512-byte sectors */
memcpy(&partition->part_uuid, &sb1->set_uuid, 16);
}
return 0;