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

Merge lookup_ext2_inode() into Ext2FS::get_inode().

Browse source
This commit is contained in:
Andreas Kling 2018-12-25 00:32:57 +01:00
parent 6451b98ad4
commit 079889050e
2 changed files with 12 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

43
VirtualFileSystem/Ext2FileSystem.cpp
View file

@ -131,18 +131,6 @@ InodeIdentifier Ext2FS::root_inode() const
return { id(), EXT2_ROOT_INO }; return { id(), EXT2_ROOT_INO };
} }
#ifdef EXT2_DEBUG
static void dumpExt2Inode(const ext2_inode& inode)
{
kprintf("Dump of ext2_inode:\n");
kprintf(" i_size: %u\n", inode.i_size);
kprintf(" i_mode: %u\n", inode.i_mode);
kprintf(" i_blocks: %u\n", inode.i_blocks);
kprintf(" i_uid: %u\n", inode.i_uid);
kprintf(" i_gid: %u\n", inode.i_gid);
}
#endif
ByteBuffer Ext2FS::read_block_containing_inode(unsigned inode, unsigned& blockIndex, unsigned& offset) const ByteBuffer Ext2FS::read_block_containing_inode(unsigned inode, unsigned& blockIndex, unsigned& offset) const
{ {
auto& superBlock = this->super_block(); auto& superBlock = this->super_block();
@ -162,24 +150,6 @@ ByteBuffer Ext2FS::read_block_containing_inode(unsigned inode, unsigned& blockIn
return readBlock(blockIndex); return readBlock(blockIndex);
} }
OwnPtr<ext2_inode> Ext2FS::lookup_ext2_inode(unsigned inode) const
{
unsigned blockIndex;
unsigned offset;
auto block = read_block_containing_inode(inode, blockIndex, offset);
if (!block)
return { };
auto* e2inode = reinterpret_cast<ext2_inode*>(kmalloc(inode_size()));
memcpy(e2inode, reinterpret_cast<ext2_inode*>(block.offset_pointer(offset)), inode_size());
#ifdef EXT2_DEBUG
dumpExt2Inode(*e2inode);
#endif
return OwnPtr<ext2_inode>(e2inode);
}
Vector<unsigned> Ext2FS::block_list_for_inode(const ext2_inode& e2inode) const Vector<unsigned> Ext2FS::block_list_for_inode(const ext2_inode& e2inode) const
{ {
unsigned entriesPerBlock = EXT2_ADDR_PER_BLOCK(&super_block()); unsigned entriesPerBlock = EXT2_ADDR_PER_BLOCK(&super_block());
@ -299,9 +269,20 @@ RetainPtr<Inode> Ext2FS::get_inode(InodeIdentifier inode) const
if (it != m_inode_cache.end()) if (it != m_inode_cache.end())
return (*it).value; return (*it).value;
} }
auto raw_inode = lookup_ext2_inode(inode.index());
unsigned block_index;
unsigned offset;
auto block = read_block_containing_inode(inode.index(), block_index, offset);
if (!block)
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) if (!raw_inode)
return nullptr; 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())

1
VirtualFileSystem/Ext2FileSystem.h
View file

@ -64,7 +64,6 @@ private:
unsigned blocks_per_group() const; unsigned blocks_per_group() const;
unsigned inode_size() const; unsigned inode_size() const;
OwnPtr<ext2_inode> lookup_ext2_inode(unsigned) const;
bool write_ext2_inode(unsigned, const ext2_inode&); bool write_ext2_inode(unsigned, const ext2_inode&);
ByteBuffer read_block_containing_inode(unsigned inode, unsigned& blockIndex, unsigned& offset) const; ByteBuffer read_block_containing_inode(unsigned inode, unsigned& blockIndex, unsigned& offset) const;