Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_gpt: properly fix block offset calculations for partition entries

Browse Source 
In 2346363b, had corrected the offset writing to the disk, but missed
correcting the offset for reading from the entries struct.

Instead of writing a block, just write the single entry, simplifying
the offset logic considerably.
This commit is contained in:
Jessica Hamilton 2015-11-20 19:17:56 +13:00
parent 856cc59e58
commit 08006f7c8f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/kernel/partitioning_systems/gpt/Header.cpp
View File

@ -193,14 +193,11 @@ Header::InitCheck() const
status_t status_t
Header::WriteEntry(int fd, uint32 entryIndex) Header::WriteEntry(int fd, uint32 entryIndex)
{ {
// Determine block to write off_t entryOffset = entryIndex * fHeader.EntrySize();
off_t blockOffset =
+ entryIndex * fHeader.EntrySize() / fBlockSize;
uint32 entryOffset = entryIndex * fHeader.EntrySize() % fBlockSize;
status_t status = _Write(fd, status_t status = _Write(fd,
(fHeader.EntriesBlock() + blockOffset) * fBlockSize + entryOffset, fHeader.EntriesBlock() * fBlockSize + entryOffset,
fEntries + entryOffset, fBlockSize); fEntries + entryOffset, fHeader.EntrySize());
if (status != B_OK) if (status != B_OK)
return status; return status;
@ -209,8 +206,8 @@ Header::WriteEntry(int fd, uint32 entryIndex)
// Write backup // Write backup
status_t backupStatus = _Write(fd, status_t backupStatus = _Write(fd,
(fBackupHeader.EntriesBlock() + blockOffset) * fBlockSize + entryOffset, fBackupHeader.EntriesBlock() * fBlockSize + entryOffset,
fEntries + entryOffset, fBlockSize); fEntries + entryOffset, fHeader.EntrySize());
return status == B_OK ? backupStatus : status; return status == B_OK ? backupStatus : status;
} }