Back filesystem by inode and not device

4 files changed, 31 insertions, 23 deletions

diff --git a/kernel/src/filesystem/ext2/filesystem.cpp b/kernel/src/filesystem/ext2/filesystem.cpp
index 0ad5c97..c0f97ed 100644
--- a/kernel/src/filesystem/ext2/filesystem.cpp
+++ b/kernel/src/filesystem/ext2/filesystem.cpp
@@ -1,8 +1,5 @@
 #include "kernel/filesystem/ext2/filesystem.hpp"
 
-#include "kapi/devices/device.hpp"
-
-#include "kernel/devices/block_device_utils.hpp"
 #include "kernel/filesystem/ext2/block_group_descriptor.hpp"
 #include "kernel/filesystem/ext2/inode.hpp"
 #include "kernel/filesystem/ext2/linked_directory_entry.hpp"
@@ -32,12 +29,11 @@ namespace kernel::filesystem::ext2
     }
   }  // namespace
 
-  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> operation_result
+  auto filesystem::mount(kstd::shared_ptr<kernel::filesystem::inode> const & backing_inode) -> operation_result
   {
-    kernel::filesystem::filesystem::mount(device);
+    kernel::filesystem::filesystem::mount(backing_inode);
 
-    kernel::devices::block_device_utils::read(m_device, &m_superblock, constants::superblock_offset,
-                                              sizeof(m_superblock));
+    m_backing_inode->read(&m_superblock, constants::superblock_offset, sizeof(m_superblock));
 
     if (m_superblock.magic != constants::magic_number)
     {
@@ -51,9 +47,8 @@ namespace kernel::filesystem::ext2
     m_block_group_descriptors = kstd::vector<block_group_descriptor>(num_block_groups);
 
     auto const block_group_descriptor_table_offset = block_size == 1024 ? 2 * block_size : block_size;
-    kernel::devices::block_device_utils::read(m_device, m_block_group_descriptors.data(),
-                                              block_group_descriptor_table_offset,
-                                              num_block_groups * sizeof(block_group_descriptor));
+    m_backing_inode->read(m_block_group_descriptors.data(), block_group_descriptor_table_offset,
+                          num_block_groups * sizeof(block_group_descriptor));
 
     m_root_inode = read_inode(constants::root_inode_number);
 
@@ -86,7 +81,7 @@ namespace kernel::filesystem::ext2
     {
       auto const global_block_number = map_inode_block_index_to_global_block_number(i, inode_data);
       auto const block_offset = global_block_number * block_size;
-      kernel::devices::block_device_utils::read(m_device, buffer.data(), block_offset, block_size);
+      m_backing_inode->read(buffer.data(), block_offset, block_size);
 
       auto const * entry = reinterpret_cast<linked_directory_entry const *>(buffer.data());
       auto bytes_read = 0uz;
@@ -125,7 +120,7 @@ namespace kernel::filesystem::ext2
     auto const inode_offset = inode_table_offset + inode_index_within_group * get_inode_size();
 
     auto new_inode = kstd::make_shared<inode>(this);
-    kernel::devices::block_device_utils::read(m_device, &new_inode->m_data, inode_offset, sizeof(inode_data));
+    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))
@@ -209,7 +204,7 @@ namespace kernel::filesystem::ext2
 
     auto const block_start_offset = block_number * get_block_size();
     auto const number_start_address = block_start_offset + index * sizeof(uint32_t);
-    kernel::devices::block_device_utils::read(m_device, &block_number_buffer, number_start_address, sizeof(uint32_t));
+    m_backing_inode->read(&block_number_buffer, number_start_address, sizeof(uint32_t));
 
     return block_number_buffer;
   }
diff --git a/kernel/src/filesystem/ext2/filesystem.tests.cpp b/kernel/src/filesystem/ext2/filesystem.tests.cpp
index b13ebf3..a7b8d5b 100644
--- a/kernel/src/filesystem/ext2/filesystem.tests.cpp
+++ b/kernel/src/filesystem/ext2/filesystem.tests.cpp
@@ -1,6 +1,7 @@
 #include "kernel/filesystem/ext2/filesystem.hpp"
 
 #include "kernel/devices/storage/management.hpp"
+#include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/inode.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/test_support/devices/block_device.hpp"
@@ -29,8 +30,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_fixture,
     auto boot_device = kernel::devices::storage::management::get().determine_boot_device();
     REQUIRE(boot_device != nullptr);
 
+    auto dev_inode = kstd::make_shared<kernel::filesystem::device_inode>(boot_device);
+
     auto fs = kernel::filesystem::ext2::filesystem{};
-    REQUIRE(fs.mount(boot_device) == kernel::filesystem::filesystem::operation_result::success);
+    REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::success);
 
     THEN("the root inode is available and is a directory")
     {
@@ -72,11 +75,13 @@ SCENARIO("Ext2 filesystem rejects invalid magic", "[filesystem][ext2][filesystem
     auto device = kstd::make_shared<kernel::tests::devices::block_device>(0, 0, "mock", block_size, 2 * block_size);
     REQUIRE(device != nullptr);
 
+    auto dev_inode = kstd::make_shared<kernel::filesystem::device_inode>(device);
+
     auto fs = kernel::filesystem::ext2::filesystem{};
 
     THEN("mount fails with invalid_magic_number")
     {
-      REQUIRE(fs.mount(device) == kernel::filesystem::filesystem::operation_result::invalid_magic_number);
+      REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::invalid_magic_number);
     }
   }
 }
@@ -92,8 +97,10 @@ SCENARIO("Ext2 block mapping includes direct and all indirect levels", "[filesys
 
     kernel::tests::filesystem::ext2::setup_mock_ext2_layout(*device);
 
+    auto dev_inode = kstd::make_shared<kernel::filesystem::device_inode>(device);
+
     auto fs = kernel::filesystem::ext2::filesystem{};
-    REQUIRE(fs.mount(device) == kernel::filesystem::filesystem::operation_result::success);
+    REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::success);
 
     auto inode_data = kernel::filesystem::ext2::inode_data{};
     inode_data.block[0] = 7;
diff --git a/kernel/src/filesystem/ext2/inode.cpp b/kernel/src/filesystem/ext2/inode.cpp
index a29bb3b..bf3f0cf 100644
--- a/kernel/src/filesystem/ext2/inode.cpp
+++ b/kernel/src/filesystem/ext2/inode.cpp
@@ -2,7 +2,6 @@
 
 #include "kapi/system.hpp"
 
-#include "kernel/devices/block_device_utils.hpp"
 #include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
@@ -41,8 +40,8 @@ namespace kernel::filesystem::ext2
       auto const read_offset = block_start_offset + in_block_offset;
       auto const bytes_to_read = std::min(size - bytes_read, m_filesystem->get_block_size() - in_block_offset);
 
-      bytes_read += kernel::devices::block_device_utils::read(
-          m_filesystem->device(), static_cast<uint8_t *>(buffer) + bytes_read, read_offset, bytes_to_read);
+      bytes_read +=
+          m_filesystem->backing_inode()->read(static_cast<uint8_t *>(buffer) + bytes_read, read_offset, bytes_to_read);
 
       block_index++;
       in_block_offset = 0;  // After the first block, we always start at the beginning of the block
@@ -56,4 +55,4 @@ namespace kernel::filesystem::ext2
     kapi::system::panic("[EXT2] inode::write is not implemented yet");
     return 0;
   }
-}  // namespace kernel::filesystem::ext2
\ No newline at end of file
+}  // namespace kernel::filesystem::ext2
diff --git a/kernel/src/filesystem/ext2/inode.tests.cpp b/kernel/src/filesystem/ext2/inode.tests.cpp
index 795ff10..ae66aff 100644
--- a/kernel/src/filesystem/ext2/inode.tests.cpp
+++ b/kernel/src/filesystem/ext2/inode.tests.cpp
@@ -1,6 +1,7 @@
 #include "kernel/filesystem/ext2/inode.hpp"
 
 #include "kernel/devices/storage/management.hpp"
+#include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/test_support/cpu.hpp"
@@ -54,8 +55,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_fixture, "Ext2 in
     auto boot_device = kernel::devices::storage::management::get().determine_boot_device();
     REQUIRE(boot_device != nullptr);
 
+    auto dev_inode = kstd::make_shared<kernel::filesystem::device_inode>(boot_device);
+
     auto fs = kernel::filesystem::ext2::filesystem{};
-    REQUIRE(fs.mount(boot_device) == kernel::filesystem::filesystem::operation_result::success);
+    REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::success);
 
     auto information = fs.lookup(fs.root_inode(), "information");
     REQUIRE(information != nullptr);
@@ -94,8 +97,10 @@ SCENARIO("Ext2 inode read stops when block mapping resolves to zero", "[filesyst
     REQUIRE(device != nullptr);
     kernel::tests::filesystem::ext2::setup_mock_ext2_layout(*device);
 
+    auto dev_inode = kstd::make_shared<kernel::filesystem::device_inode>(device);
+
     auto fs = kernel::filesystem::ext2::filesystem{};
-    REQUIRE(fs.mount(device) == kernel::filesystem::filesystem::operation_result::success);
+    REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::success);
 
     auto inode = kernel::filesystem::ext2::inode{&fs};
     inode.m_data.blocks = 2;
@@ -120,8 +125,10 @@ SCENARIO("Ext2 inode read across block boundaries", "[filesystem][ext2][inode]")
     REQUIRE(device != nullptr);
     kernel::tests::filesystem::ext2::setup_mock_ext2_layout(*device);
 
+    auto dev_inode = kstd::make_shared<kernel::filesystem::device_inode>(device);
+
     auto fs = kernel::filesystem::ext2::filesystem{};
-    REQUIRE(fs.mount(device) == kernel::filesystem::filesystem::operation_result::success);
+    REQUIRE(fs.mount(dev_inode) == kernel::filesystem::filesystem::operation_result::success);
 
     auto inode = kernel::filesystem::ext2::inode{&fs};
     inode.m_data.blocks = 2;