Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: Remove for_each_block from Ext2

This commit is contained in:
Bananymous 2023-03-21 18:14:02 +02:00
parent 54824aec74
commit 3652d11059
2 changed files with 31 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/include/kernel/FS/Ext2.h
View File

@ -143,9 +143,6 @@ namespace Kernel
private: private:
BAN::ErrorOr<uint32_t> data_block_index(uint32_t); BAN::ErrorOr<uint32_t> data_block_index(uint32_t);
using block_callback_t = BAN::ErrorOr<bool>(*)(const BAN::Vector<uint8_t>&, void*);
BAN::ErrorOr<void> for_each_block(block_callback_t, void*);
uint32_t index() const { return m_index; } uint32_t index() const { return m_index; }
private: private:

85
kernel/kernel/FS/Ext2.cpp
View File

@ -215,21 +215,6 @@ namespace Kernel
ASSERT(false); ASSERT(false);
} }
BAN::ErrorOr<void> Ext2Inode::for_each_block(block_callback_t callback, void* callback_data)
{
uint32_t data_block_count = m_inode.blocks / (2 << m_fs.superblock().log_block_size);
for (uint32_t i = 0; i < data_block_count; i++)
{
uint32_t data_block_index = TRY(this->data_block_index(i));
auto block_data = TRY(m_fs.read_block(data_block_index));
if (!TRY(callback(block_data, callback_data)))
return {};
}
return {};
}
BAN::ErrorOr<size_t> Ext2Inode::read(size_t offset, void* buffer, size_t count) BAN::ErrorOr<size_t> Ext2Inode::read(size_t offset, void* buffer, size_t count)
{ {
if (ifdir()) if (ifdir())
@ -268,42 +253,32 @@ namespace Kernel
if (!ifdir()) if (!ifdir())
return BAN::Error::from_errno(ENOTDIR); return BAN::Error::from_errno(ENOTDIR);
struct search_info uint32_t data_block_count = m_inode.blocks / (2 << m_fs.superblock().log_block_size);
for (uint32_t i = 0; i < data_block_count; i++)
{ {
BAN::StringView file_name; auto data_block_index_or_error = data_block_index(i);
BAN::RefPtr<Inode> result; if (data_block_index_or_error.is_error())
Ext2FS* fs;
};
search_info info;
info.file_name = file_name;
info.result = {};
info.fs = &m_fs;
block_callback_t function =
[](const BAN::Vector<uint8_t>& block_data, void* info_) -> BAN::ErrorOr<bool>
{ {
search_info& info = *(search_info*)info_; dprintln("{}", data_block_index_or_error.error());
continue;
}
uintptr_t block_data_end = (uintptr_t)block_data.data() + block_data.size(); auto block_data = TRY(m_fs.read_block(data_block_index_or_error.value()));
uintptr_t entry_addr = (uintptr_t)block_data.data();
while (entry_addr < block_data_end) const uint8_t* block_data_end = block_data.data() + block_data.size();
{ const uint8_t* entry_addr = block_data.data();
Ext2::LinkedDirectoryEntry* entry = (Ext2::LinkedDirectoryEntry*)entry_addr;
BAN::StringView entry_name = BAN::StringView(entry->name, entry->name_len); while (entry_addr < block_data_end)
if (entry->inode && info.file_name == entry_name) {
{ const auto& entry = *(const Ext2::LinkedDirectoryEntry*)entry_addr;
info.result = TRY(Ext2Inode::create(*info.fs, entry->inode, entry_name)); BAN::StringView entry_name(entry.name, entry.name_len);
return false; if (entry.inode && entry_name == file_name)
} return TRY(Ext2Inode::create(m_fs, entry.inode, entry.name));
entry_addr += entry->rec_len; entry_addr += entry.rec_len;
} }
return true; }
};
TRY(for_each_block(function, &info));
if (info.result)
return info.result;
return BAN::Error::from_errno(ENOENT); return BAN::Error::from_errno(ENOENT);
} }
@ -327,18 +302,18 @@ namespace Kernel
auto block_data = TRY(m_fs.read_block(data_block_index_or_error.value())); auto block_data = TRY(m_fs.read_block(data_block_index_or_error.value()));
uint8_t* block_data_end = block_data.data() + block_data.size(); const uint8_t* block_data_end = block_data.data() + block_data.size();
uint8_t* entry_addr = block_data.data(); const uint8_t* entry_addr = block_data.data();
while (entry_addr < block_data_end) while (entry_addr < block_data_end)
{ {
Ext2::LinkedDirectoryEntry* entry = (Ext2::LinkedDirectoryEntry*)entry_addr; const auto& entry = *(const Ext2::LinkedDirectoryEntry*)entry_addr;
if (entry->inode) if (entry.inode)
{ {
auto entry_name = BAN::StringView(entry->name, entry->name_len); BAN::StringView entry_name(entry.name, entry.name_len);
auto inode = TRY(Ext2Inode::create(m_fs, entry->inode, entry_name)); auto inode = TRY(Ext2Inode::create(m_fs, entry.inode, entry_name));
TRY(inodes.push_back(inode)); TRY(inodes.push_back(inode));
} }
entry_addr += entry->rec_len; entry_addr += entry.rec_len;
} }
} }
@ -350,7 +325,7 @@ namespace Kernel
if (type() != other.type()) if (type() != other.type())
return false; return false;
Ext2Inode& ext2_other = (Ext2Inode&)other; const auto& ext2_other = (const Ext2Inode&)other;
if (&m_fs != &ext2_other.m_fs) if (&m_fs != &ext2_other.m_fs)
return false; return false;
return index() == ext2_other.index(); return index() == ext2_other.index();