Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

BFS: Be explicit about blocks_per_ag field meaning

Browse Source 
Superblock field blocks_per_ag is confusing, as it holds the number
of bitmap blocks that are in each allocation group, not the number
of disk blocks per allocation group. Try to clarify when possible.

Change-Id: I60dad9d3c5245dd126ecfea817108e2cefa4cf02
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8566
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Haiku-Format: Haiku-format Bot <no-reply+haikuformatbot@haiku-os.org>
This commit is contained in:
dalme 2024-11-16 18:33:40 +01:00 committed by waddlesplash
parent 9bb1816c14
commit edac63079f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/kernel/file_systems/bfs/Volume.cpp
View File

@ -82,7 +82,7 @@ disk_super_block::Initialize(const char* diskName, off_t numBlocks,
int32 bitsPerBlock = blockSize << 3; int32 bitsPerBlock = blockSize << 3;
off_t bitmapBlocks = (numBlocks + bitsPerBlock - 1) / bitsPerBlock; off_t bitmapBlocks = (numBlocks + bitsPerBlock - 1) / bitsPerBlock;
int32 blocksPerGroup = 1; int32 bitmapBlocksPerGroup = 1;
int32 groupShift = 13; int32 groupShift = 13;
for (int32 i = 8192; i < bitsPerBlock; i *= 2) { for (int32 i = 8192; i < bitsPerBlock; i *= 2) {
@ -97,19 +97,20 @@ disk_super_block::Initialize(const char* diskName, off_t numBlocks,
int32 numGroups; int32 numGroups;
while (true) { while (true) {
numGroups = (bitmapBlocks + blocksPerGroup - 1) / blocksPerGroup; numGroups = (bitmapBlocks + bitmapBlocksPerGroup - 1) / bitmapBlocksPerGroup;
if (numGroups > kDesiredAllocationGroups) { if (numGroups > kDesiredAllocationGroups) {
if (groupShift == 16) if (groupShift == 16)
break; break;
groupShift++; groupShift++;
blocksPerGroup *= 2; bitmapBlocksPerGroup *= 2;
} else } else
break; break;
} }
num_ags = HOST_ENDIAN_TO_BFS_INT32(numGroups); num_ags = HOST_ENDIAN_TO_BFS_INT32(numGroups);
blocks_per_ag = HOST_ENDIAN_TO_BFS_INT32(blocksPerGroup); // blocks_per_ag holds the number of bitmap blocks that are in each allocation group
blocks_per_ag = HOST_ENDIAN_TO_BFS_INT32(bitmapBlocksPerGroup);
ag_shift = HOST_ENDIAN_TO_BFS_INT32(groupShift); ag_shift = HOST_ENDIAN_TO_BFS_INT32(groupShift);
} }