RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 20:15:07 +00:00
Code Issues Activity Actions

Ext2FS: Tidy up code related to the Ext2 super block a bit

Browse source 
Store the cached super block as an ext2_super_block member instead of
caching it in a ByteBuffer and using a casting helper everywhere.

This patch also combines reading/writing of the super block into a
single disk device operation (instead of two.)
This commit is contained in:
Andreas Kling 2019-11-02 11:49:11 +01:00
parent e4b7786b66
commit 3a8b5b405c
2 changed files with 15 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Kernel/FileSystem/Ext2FileSystem.h
View file

@ -78,7 +78,7 @@ private:
typedef unsigned InodeIndex;
explicit Ext2FS(NonnullRefPtr<DiskDevice>&&);
const ext2_super_block& super_block() const;
const ext2_super_block& super_block() const { return m_super_block; }
const ext2_group_desc& group_descriptor(unsigned groupIndex) const;
void flush_block_group_descriptor_table();
unsigned first_block_of_group(unsigned groupIndex) const;
@ -90,8 +90,7 @@ private:
bool write_ext2_inode(InodeIndex, const ext2_inode&);
bool read_block_containing_inode(InodeIndex inode, BlockIndex& block_index, unsigned& offset, u8* buffer) const;
ByteBuffer read_super_block() const;
bool write_super_block(const ext2_super_block&);
bool flush_super_block();
virtual const char* class_name() const override;
virtual InodeIdentifier root_inode() const override;
@ -129,7 +128,7 @@ private:
unsigned m_block_group_count { 0 };
mutable ByteBuffer m_cached_super_block;
mutable ext2_super_block m_super_block;
mutable ByteBuffer m_cached_group_descriptor_table;
mutable HashMap<BlockIndex, RefPtr<Ext2FSInode>> m_inode_cache;