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

[Victoria Falls] Print only the root directory information.

Browse source 
Move the InodeTable creating to the Init function which (somewhat)
requires us to stop taking the Ext2BlockReader as a reference (the reference
from the Init function goes out of scope). Make the Ext2BlockReader Init
function return a shared ptr by default.
This commit is contained in:
Drew Galbraith 2023-08-01 10:39:26 -07:00
parent bed685af65
commit 083ed52ddd
7 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,31 +2,32 @@
#include <mammoth/debug.h>
InodeTable::InodeTable(Ext2BlockReader& reader, BlockGroupDescriptor* bgdt)
InodeTable::InodeTable(const glcr::SharedPtr<Ext2BlockReader>& reader,
BlockGroupDescriptor* bgdt)
: ext2_reader_(reader), bgdt_(bgdt) {
inode_tables_.Resize(ext2_reader_.NumberOfBlockGroups());
inode_tables_.Resize(ext2_reader_->NumberOfBlockGroups());
}
glcr::ErrorOr<Inode*> InodeTable::GetInode(uint64_t inode_num) {
uint64_t inodes_per_group = ext2_reader_.GetSuperblock()->inodes_per_group;
glcr::ErrorOr<Inode*> InodeTable::GetInode(uint32_t inode_num) {
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;
return reinterpret_cast<Inode*>(reinterpret_cast<uint64_t>(root) +
local_index * ext2_reader_.InodeSize());
local_index * ext2_reader_->InodeSize());
}
glcr::ErrorOr<Inode*> InodeTable::GetRootOfInodeTable(
uint64_t block_group_num) {
if (block_group_num > ext2_reader_.NumberOfBlockGroups()) {
if (block_group_num > ext2_reader_->NumberOfBlockGroups()) {
return glcr::INVALID_ARGUMENT;
}
if (!inode_tables_[block_group_num]) {
ASSIGN_OR_RETURN(
inode_tables_[block_group_num],
ext2_reader_.ReadBlocks(bgdt_[block_group_num].inode_table,
ext2_reader_.InodeTableBlockSize()));
ext2_reader_->ReadBlocks(bgdt_[block_group_num].inode_table,
ext2_reader_->InodeTableBlockSize()));
}
return reinterpret_cast<Inode*>(inode_tables_[block_group_num].vaddr());
}