Merge branch 'symbolic-links' into 'develop-BA-FS26'

Symbolic links

See merge request teachos/kernel!29

1 files changed, 4 insertions, 32 deletions

diff --git a/kernel/src/filesystem/ext2/filesystem.cpp b/kernel/src/filesystem/ext2/filesystem.cpp
index 41572ee..47e54fe 100644
--- a/kernel/src/filesystem/ext2/filesystem.cpp
+++ b/kernel/src/filesystem/ext2/filesystem.cpp
@@ -16,19 +16,6 @@
 
 namespace kernel::filesystem::ext2
 {
-  namespace
-  {
-    auto S_ISREG(uint16_t mode) -> bool
-    {
-      return (mode & constants::mode_mask) == constants::mode_regular;
-    }
-
-    auto S_ISDIR(uint16_t mode) -> bool
-    {
-      return (mode & constants::mode_mask) == constants::mode_directory;
-    }
-  }  // namespace
-
   auto filesystem::mount(kstd::shared_ptr<kernel::filesystem::inode> const & backing_inode) -> operation_result
   {
     kernel::filesystem::filesystem::mount(backing_inode);
@@ -74,7 +61,7 @@ namespace kernel::filesystem::ext2
     }
 
     auto const block_size = get_block_size();
-    auto const & inode_data = ext2_parent->m_data;
+    auto const & inode_data = ext2_parent->data();
     kstd::vector<uint8_t> buffer(block_size);
 
     for (uint32_t i = 0; i < get_inode_block_count(inode_data); ++i)
@@ -119,25 +106,10 @@ namespace kernel::filesystem::ext2
     auto const inode_table_offset = static_cast<size_t>(inode_table_start_block) * block_size;
     auto const inode_offset = inode_table_offset + inode_index_within_group * get_inode_size();
 
-    auto new_inode = kstd::make_shared<inode>(this);
-    m_backing_inode->read(&new_inode->m_data, inode_offset, sizeof(inode_data));
-
-    // TODO BA-FS26 improve inode_kind really needed? or just map it to the mode bits?
-    if (S_ISREG(new_inode->m_data.mode))
-    {
-      new_inode->m_kind = inode::inode_kind::regular;
-    }
-    else if (S_ISDIR(new_inode->m_data.mode))
-    {
-      new_inode->m_kind = inode::inode_kind::directory;
-    }
-    else
-    {
-      // TODO BA-FS26 really correct??
-      return nullptr;
-    }
+    auto new_inode_data = inode_data{};
+    m_backing_inode->read(&new_inode_data, inode_offset, sizeof(inode_data));
 
-    return new_inode;
+    return kstd::make_shared<inode>(this, new_inode_data);
   }
 
   auto filesystem::map_inode_block_index_to_global_block_number(uint32_t inode_block_index, inode_data data) -> uint32_t