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

Kernel: Modify block lists in place for Ext2FSInode::resize()

Browse source 
This significantly reduces the number of allocations/deallocations
inside the kernel when growing files as well as reducing spam in the
kernel logs.
This commit is contained in:
Jean-Baptiste Boric 2021-03-10 18:47:11 +01:00 • committed by Andreas Kling
parent 56ecb55d9f
commit facd18113b
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -806,26 +806,23 @@ KResult Ext2FSInode::resize(u64 new_size)
return ENOSPC; return ENOSPC;
} }
Vector<Ext2FS::BlockIndex> block_list; if (m_block_list.is_empty())
if (!m_block_list.is_empty()) m_block_list = this->compute_block_list();
block_list = m_block_list;
else
block_list = this->compute_block_list();
if (blocks_needed_after > blocks_needed_before) { if (blocks_needed_after > blocks_needed_before) {
auto blocks_or_error = fs().allocate_blocks(fs().group_index_from_inode(index()), blocks_needed_after - blocks_needed_before); auto blocks_or_error = fs().allocate_blocks(fs().group_index_from_inode(index()), blocks_needed_after - blocks_needed_before);
if (blocks_or_error.is_error()) if (blocks_or_error.is_error())
return blocks_or_error.error(); return blocks_or_error.error();
block_list.append(blocks_or_error.release_value()); m_block_list.append(blocks_or_error.release_value());
} else if (blocks_needed_after < blocks_needed_before) { } else if (blocks_needed_after < blocks_needed_before) {
if constexpr (EXT2_DEBUG) { if constexpr (EXT2_DEBUG) {
dbgln("Ext2FS: Shrinking inode {}. Old block list is {} entries:", index(), block_list.size()); dbgln("Ext2FS: Shrinking inode {}. Old block list is {} entries:", index(), m_block_list.size());
for (auto block_index : block_list) { for (auto block_index : m_block_list) {
dbgln(" # {}", block_index); dbgln(" # {}", block_index);
} }
} }
while (block_list.size() != blocks_needed_after) { while (m_block_list.size() != blocks_needed_after) {
auto block_index = block_list.take_last(); auto block_index = m_block_list.take_last();
if (block_index.value()) { if (block_index.value()) {
auto result = fs().set_block_allocation_state(block_index, false); auto result = fs().set_block_allocation_state(block_index, false);
if (result.is_error()) { if (result.is_error()) {
@ -836,8 +833,6 @@ KResult Ext2FSInode::resize(u64 new_size)
} }
} }
m_block_list = move(block_list);
auto result = flush_block_list(); auto result = flush_block_list();
if (result.is_error()) if (result.is_error())
return result; return result;