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

Kernel: Make Ext2FS::free_inode() return KResult, and use TRY() more

Browse source 
While there's no clear propagation path for errors that happen in an
inode destructor, using TRY() still makes the code a lot nicer.
This commit is contained in:
Andreas Kling 2021-10-21 17:06:38 +02:00
parent 98b865fe10
commit fe98cb2c4b
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -633,7 +633,7 @@ Vector<Ext2FS::BlockIndex> Ext2FSInode::compute_block_list_impl_internal(const e
return list; return list;
} }
void Ext2FS::free_inode(Ext2FSInode& inode) KResult Ext2FS::free_inode(Ext2FSInode& inode)
{ {
MutexLocker locker(m_lock); MutexLocker locker(m_lock);
VERIFY(inode.m_raw_inode.i_links_count == 0); VERIFY(inode.m_raw_inode.i_links_count == 0);
@ -642,11 +642,8 @@ void Ext2FS::free_inode(Ext2FSInode& inode)
// Mark all blocks used by this inode as free. // Mark all blocks used by this inode as free.
for (auto block_index : inode.compute_block_list_with_meta_blocks()) { for (auto block_index : inode.compute_block_list_with_meta_blocks()) {
VERIFY(block_index <= super_block().s_blocks_count); VERIFY(block_index <= super_block().s_blocks_count);
if (block_index.value()) { if (block_index.value())
if (auto result = set_block_allocation_state(block_index, false); result.is_error()) { TRY(set_block_allocation_state(block_index, false));
dbgln("Ext2FS[{}]::free_inode(): Failed to deallocate block {} for inode {}", fsid(), block_index, inode.index());
}
}
} }
// If the inode being freed is a directory, update block group directory counter. // If the inode being freed is a directory, update block group directory counter.
@ -660,12 +657,12 @@ void Ext2FS::free_inode(Ext2FSInode& inode)
// NOTE: After this point, the inode metadata is wiped. // NOTE: After this point, the inode metadata is wiped.
memset(&inode.m_raw_inode, 0, sizeof(ext2_inode)); memset(&inode.m_raw_inode, 0, sizeof(ext2_inode));
inode.m_raw_inode.i_dtime = kgettimeofday().to_truncated_seconds(); inode.m_raw_inode.i_dtime = kgettimeofday().to_truncated_seconds();
if (auto result = write_ext2_inode(inode.index(), inode.m_raw_inode); result.is_error()) TRY(write_ext2_inode(inode.index(), inode.m_raw_inode));
dbgln("Ext2FS[{}]::free_inode(): Failed to write inode {}: {}", fsid(), inode.index(), result.error());
// Mark the inode as free. // Mark the inode as free.
if (auto result = set_inode_allocation_state(inode.index(), false); result.is_error()) TRY(set_inode_allocation_state(inode.index(), false));
dbgln("Ext2FS[{}]::free_inode(): Failed to free inode {}: {}", fsid(), inode.index(), result.error());
return KSuccess;
} }
void Ext2FS::flush_block_group_descriptor_table() void Ext2FS::flush_block_group_descriptor_table()
@ -736,8 +733,10 @@ Ext2FSInode::Ext2FSInode(Ext2FS& fs, InodeIndex index)
Ext2FSInode::~Ext2FSInode() Ext2FSInode::~Ext2FSInode()
{ {
if (m_raw_inode.i_links_count == 0) if (m_raw_inode.i_links_count == 0) {
fs().free_inode(*this); // Alas, we have nowhere to propagate any errors that occur here.
(void)fs().free_inode(*this);
}
} }
u64 Ext2FSInode::size() const u64 Ext2FSInode::size() const

2
Kernel/FileSystem/Ext2FileSystem.h
View file

@ -145,7 +145,7 @@ private:
KResult set_block_allocation_state(BlockIndex, bool); KResult set_block_allocation_state(BlockIndex, bool);
void uncache_inode(InodeIndex); void uncache_inode(InodeIndex);
void free_inode(Ext2FSInode&); KResult free_inode(Ext2FSInode&);
struct BlockListShape { struct BlockListShape {
unsigned direct_blocks { 0 }; unsigned direct_blocks { 0 };