system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-17 21:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ext2FS: Avoid a kmallocation every time we fetch an inode from disk.

Browse source
This commit is contained in:
Andreas Kling 2019-02-03 04:05:30 +01:00
parent db2422d0d3
commit 3a9c01619f
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Kernel/Ext2FileSystem.cpp
View file

@ -329,9 +329,8 @@ void Ext2FS::flush_block_group_descriptor_table()
write_blocks(first_block_of_bgdt, blocks_to_write, m_cached_group_descriptor_table); write_blocks(first_block_of_bgdt, blocks_to_write, m_cached_group_descriptor_table);
} }
Ext2FSInode::Ext2FSInode(Ext2FS& fs, unsigned index, const ext2_inode& raw_inode) Ext2FSInode::Ext2FSInode(Ext2FS& fs, unsigned index)
: Inode(fs, index) : Inode(fs, index)
, m_raw_inode(raw_inode)
{ {
} }
@ -402,18 +401,12 @@ RetainPtr<Inode> Ext2FS::get_inode(InodeIdentifier inode) const
if (!block) if (!block)
return { }; return { };
// FIXME: Avoid this extra allocation, copy the raw inode directly into the Ext2FSInode metadata somehow.
auto* e2inode = reinterpret_cast<ext2_inode*>(kmalloc(inode_size()));
memcpy(e2inode, reinterpret_cast<ext2_inode*>(block.offset_pointer(offset)), inode_size());
auto raw_inode = OwnPtr<ext2_inode>(e2inode);
if (!raw_inode)
return nullptr;
LOCKER(m_inode_cache_lock); LOCKER(m_inode_cache_lock);
auto it = m_inode_cache.find(inode.index()); auto it = m_inode_cache.find(inode.index());
if (it != m_inode_cache.end()) if (it != m_inode_cache.end())
return (*it).value; return (*it).value;
auto new_inode = adopt(*new Ext2FSInode(const_cast<Ext2FS&>(*this), inode.index(), *raw_inode)); auto new_inode = adopt(*new Ext2FSInode(const_cast<Ext2FS&>(*this), inode.index()));
memcpy(&new_inode->m_raw_inode, reinterpret_cast<ext2_inode*>(block.offset_pointer(offset)), inode_size());
m_inode_cache.set(inode.index(), new_inode.copy_ref()); m_inode_cache.set(inode.index(), new_inode.copy_ref());
return new_inode; return new_inode;
} }

2
Kernel/Ext2FileSystem.h
View file

@ -47,7 +47,7 @@ private:
Ext2FS& fs(); Ext2FS& fs();
const Ext2FS& fs() const; const Ext2FS& fs() const;
Ext2FSInode(Ext2FS&, unsigned index, const ext2_inode&); Ext2FSInode(Ext2FS&, unsigned index);
mutable Vector<unsigned> m_block_list; mutable Vector<unsigned> m_block_list;
mutable HashMap<String, unsigned> m_lookup_cache; mutable HashMap<String, unsigned> m_lookup_cache;