drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[victoriafalls] Move a superblock-based calculations to the block reader

Browse source
This commit is contained in:
Drew Galbraith 2023-07-06 09:58:26 -07:00
parent 52b4b273b7
commit 150bfd2fd4
5 changed files with 60 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

34
sys/victoriafalls/fs/ext2/inode_table.cpp
View file

@ -3,42 +3,30 @@
#include <mammoth/debug.h>
InodeTable::InodeTable(Ext2BlockReader& reader, BlockGroupDescriptor* bgdt)
: ext2_reader_(reader),
bgdt_(bgdt),
num_block_groups_(((reader.GetSuperblock()->blocks_count - 1) /
reader.GetSuperblock()->blocks_per_group) +
1),
inodes_per_group_(reader.GetSuperblock()->inodes_per_group) {
inode_tables_.Resize(num_block_groups_);
dbgln("EXT rev: %x", reader.GetSuperblock()->rev_level);
inode_size_ = reader.GetSuperblock()->rev_level >= 1
? reader.GetSuperblock()->inode_size
: 0x80;
: ext2_reader_(reader), bgdt_(bgdt) {
inode_tables_.Resize(ext2_reader_.NumberOfBlockGroups());
}
glcr::ErrorOr<Inode*> InodeTable::GetInode(uint64_t inode_num) {
uint64_t block_group_num = (inode_num - 1) / inodes_per_group_;
uint64_t inodes_per_group = ext2_reader_.GetSuperblock()->inodes_per_group;
uint64_t block_group_num = (inode_num - 1) / inodes_per_group;
ASSIGN_OR_RETURN(Inode * root, GetRootOfInodeTable(block_group_num));
uint64_t local_index = (inode_num - 1) % inodes_per_group_;
uint64_t local_index = (inode_num - 1) % inodes_per_group;
return reinterpret_cast<Inode*>(reinterpret_cast<uint64_t>(root) +
local_index * inode_size_);
local_index * ext2_reader_.InodeSize());
}
glcr::ErrorOr<Inode*> InodeTable::GetRootOfInodeTable(
uint64_t block_group_num) {
if (block_group_num > num_block_groups_) {
if (block_group_num > ext2_reader_.NumberOfBlockGroups()) {
return glcr::INVALID_ARGUMENT;
}
if (!inode_tables_[block_group_num]) {
// FIXME: Don't hardcode block and inode size here.
uint64_t inode_table_size =
((inodes_per_group_ * inode_size_ - 1) / 1024) + 1;
dbgln("Reading %lx, %lx", bgdt_[block_group_num].inode_table,
inode_table_size);
ASSIGN_OR_RETURN(inode_tables_[block_group_num],
ext2_reader_.ReadBlocks(bgdt_[block_group_num].inode_table,
inode_table_size));
ASSIGN_OR_RETURN(
inode_tables_[block_group_num],
ext2_reader_.ReadBlocks(bgdt_[block_group_num].inode_table,
ext2_reader_.InodeTableBlockSize()));
}
return reinterpret_cast<Inode*>(inode_tables_[block_group_num].vaddr());
}