i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpt: Fixed off by one error.

Browse Source 
* The backup header would have been written one block behind the actual
  last block. Well, at least it would have tried to do so :-)
This commit is contained in:
Axel Dörfler
2013-01-29 00:02:31 +01:00
parent 7775bfeb6b
commit 2dd0a26ac0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/partitioning_systems/gpt/efi_gpt.cpp
+4 -5
View File
@@ -73,7 +73,7 @@ static float
efi_gpt_identify_partition(int fd, partition_data* partition, void** _cookie) efi_gpt_identify_partition(int fd, partition_data* partition, void** _cookie)
{ {
EFI::Header* header = new (std::nothrow) EFI::Header(fd, EFI::Header* header = new (std::nothrow) EFI::Header(fd,
partition->size / partition->block_size, partition->block_size); (partition->size - 1) / partition->block_size, partition->block_size);
status_t status = header->InitCheck(); status_t status = header->InitCheck();
if (status != B_OK) { if (status != B_OK) {
delete header; delete header;
@@ -110,9 +110,8 @@ efi_gpt_scan_partition(int fd, partition_data* partition, void* _cookie)
if (entry.EndBlock() * partition->block_size if (entry.EndBlock() * partition->block_size
> (uint64)partition->size) { > (uint64)partition->size) {
TRACE(("efi_gpt: child partition exceeds existing space (%Ld MB)\n", TRACE(("efi_gpt: child partition exceeds existing space (ends at "
(entry.EndBlock() - entry.StartBlock()) * partition->block_size "block %" B_PRIu64 ")\n", entry.EndBlock()));
/ 1024 / 1024));
continue; continue;
} }
@@ -699,7 +698,7 @@ efi_gpt_initialize(int fd, partition_id partitionID, const char* name,
update_disk_device_job_progress(job, 0.0); update_disk_device_job_progress(job, 0.0);
EFI::Header header(partitionSize / partition->block_size, EFI::Header header((partitionSize - 1) / partition->block_size,
partition->block_size); partition->block_size);
status_t result = header.InitCheck(); status_t result = header.InitCheck();
if (result != B_OK) if (result != B_OK)