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

bfs: don't allocate more than the maximum in an AllocationGroup

Browse Source 
* The reserved blocks could exhaust the first allocation group, so iterate as much as needed.
* fix #11753

Change-Id: Ib1d7f87946f7b96dfcade8f5778a14065d965f6b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5417
Reviewed-by: waddlesplash <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Jérôme Duval
2022-06-28 06:02:19 +00:00
parent 1e68c512da
commit b5417d2089
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
+10 -4
View File
@@ -597,10 +597,16 @@ BlockAllocator::InitializeAndClearBitmap(Transaction& transaction)
// reserve the boot block, the log area, and the block bitmap itself // reserve the boot block, the log area, and the block bitmap itself
uint32 reservedBlocks = fVolume->Log().Start() + fVolume->Log().Length(); uint32 reservedBlocks = fVolume->Log().Start() + fVolume->Log().Length();
uint32 blocksToReserve = reservedBlocks;
if (fGroups[0].Allocate(transaction, 0, reservedBlocks) < B_OK) { for (int32 i = 0; i < fNumGroups; i++) {
FATAL(("could not allocate reserved space for block bitmap/log!\n")); int32 reservedBlocksInGroup = min_c(blocksToReserve, numBits);
return B_ERROR; if (fGroups[i].Allocate(transaction, 0, reservedBlocksInGroup) < B_OK) {
FATAL(("could not allocate reserved space for block bitmap/log!\n"));
return B_ERROR;
}
blocksToReserve -= reservedBlocksInGroup;
if (blocksToReserve == 0)
break;
} }
fVolume->SuperBlock().used_blocks fVolume->SuperBlock().used_blocks
= HOST_ENDIAN_TO_BFS_INT64(reservedBlocks); = HOST_ENDIAN_TO_BFS_INT64(reservedBlocks);