RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 00:27:35 +00:00
Code Issues Activity Actions

Ext2FS: Update block group directory count after directory removal

Browse source 
When freeing an inode, we were checking if it's a directory *after*
wiping the inode metadata. This caused us to forget updating the block
group descriptor with the new directory count.
This commit is contained in:
Andreas Kling 2021-01-17 16:56:07 +01:00
parent 1382bbfc57
commit 6613cef2f8
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -531,28 +531,29 @@ void Ext2FS::free_inode(Ext2FSInode& inode)
dbgln("Ext2FS: Inode {} has no more links, time to delete!", inode.index()); dbgln("Ext2FS: Inode {} has no more links, time to delete!", inode.index());
#endif #endif
// Mark all blocks used by this inode as free.
auto block_list = block_list_for_inode(inode.m_raw_inode, true); auto block_list = block_list_for_inode(inode.m_raw_inode, true);
for (auto block_index : block_list) { for (auto block_index : block_list) {
ASSERT(block_index <= super_block().s_blocks_count); ASSERT(block_index <= super_block().s_blocks_count);
if (block_index) if (block_index)
set_block_allocation_state(block_index, false); set_block_allocation_state(block_index, false);
} }
struct timeval now; // If the inode being freed is a directory, update block group directory counter.
kgettimeofday(now);
memset(&inode.m_raw_inode, 0, sizeof(ext2_inode));
inode.m_raw_inode.i_dtime = now.tv_sec;
write_ext2_inode(inode.index(), inode.m_raw_inode);
set_inode_allocation_state(inode.index(), false);
if (inode.is_directory()) { if (inode.is_directory()) {
auto& bgd = const_cast<ext2_group_desc&>(group_descriptor(group_index_from_inode(inode.index()))); auto& bgd = const_cast<ext2_group_desc&>(group_descriptor(group_index_from_inode(inode.index())));
--bgd.bg_used_dirs_count; --bgd.bg_used_dirs_count;
dbgln("Ext2FS: Decremented bg_used_dirs_count to {}", bgd.bg_used_dirs_count); dbgln("Ext2FS: Decremented bg_used_dirs_count to {}", bgd.bg_used_dirs_count);
m_block_group_descriptors_dirty = true; m_block_group_descriptors_dirty = true;
} }
// NOTE: After this point, the inode metadata is wiped.
memset(&inode.m_raw_inode, 0, sizeof(ext2_inode));
inode.m_raw_inode.i_dtime = kgettimeofday().tv_sec;
write_ext2_inode(inode.index(), inode.m_raw_inode);
// Mark the inode as free.
set_inode_allocation_state(inode.index(), false);
} }
void Ext2FS::flush_block_group_descriptor_table() void Ext2FS::flush_block_group_descriptor_table()