RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:18:11 +00:00
Code Issues Activity Actions

Ext2FS: The block numbers returned by allocate_blocks() should be 1-based.

Browse source 
e2fsck complained about two inodes sharing the same block, and this was why.
This commit is contained in:
Andreas Kling 2019-06-09 14:58:32 +02:00
parent 7562c0b7bf
commit 51d70996ba
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -881,7 +881,7 @@ Vector<Ext2FS::BlockIndex> Ext2FS::allocate_blocks(GroupIndex group_index, int c
auto bitmap_block = read_block(bgd.bg_block_bitmap); auto bitmap_block = read_block(bgd.bg_block_bitmap);
int blocks_in_group = min(blocks_per_group(), super_block().s_blocks_count); int blocks_in_group = min(blocks_per_group(), super_block().s_blocks_count);
auto block_bitmap = Bitmap::wrap(bitmap_block.pointer(), blocks_in_group); auto block_bitmap = Bitmap::wrap(bitmap_block.pointer(), blocks_in_group);
BlockIndex first_block_in_group = (group_index - 1) * blocks_per_group(); BlockIndex first_block_in_group = (group_index - 1) * blocks_per_group() + 1;
for (int i = 0; i < block_bitmap.size(); ++i) { for (int i = 0; i < block_bitmap.size(); ++i) {
if (!block_bitmap.get(i)) { if (!block_bitmap.get(i)) {
blocks.append(first_block_in_group + i); blocks.append(first_block_in_group + i);
@ -1041,7 +1041,7 @@ bool Ext2FS::set_block_allocation_state(BlockIndex block_index, bool new_state)
#endif #endif
unsigned group_index = group_index_from_block_index(block_index); unsigned group_index = group_index_from_block_index(block_index);
auto& bgd = group_descriptor(group_index); auto& bgd = group_descriptor(group_index);
BlockIndex index_in_group = block_index - ((group_index - 1) * blocks_per_group()); BlockIndex index_in_group = (block_index - 1) - ((group_index - 1) * blocks_per_group());
unsigned bit_index = index_in_group % blocks_per_group(); unsigned bit_index = index_in_group % blocks_per_group();
#ifdef EXT2_DEBUG #ifdef EXT2_DEBUG
dbgprintf(" index_in_group: %u\n", index_in_group); dbgprintf(" index_in_group: %u\n", index_in_group);