Merge branch 'refactoring' into 'develop-BA-FS26'

Refactoring

See merge request teachos/kernel!26

3 files changed, 6 insertions, 4 deletions

diff --git a/kernel/include/kernel/filesystem/devfs/filesystem.hpp b/kernel/include/kernel/filesystem/devfs/filesystem.hpp
index 3a52403..53bb87d 100644
--- a/kernel/include/kernel/filesystem/devfs/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/devfs/filesystem.hpp
@@ -1,6 +1,7 @@
 #ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVFS_FILESYSTEM_HPP
 #define TEACH_OS_KERNEL_FILESYSTEM_DEVFS_FILESYSTEM_HPP
 
+#include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
@@ -37,6 +38,8 @@ namespace kernel::filesystem::devfs
 
   private:
     auto build_device_inode_table() -> void;
+
+    kstd::vector<kstd::shared_ptr<device_inode>> m_inodes{};
   };
 }  // namespace kernel::filesystem::devfs
 
diff --git a/kernel/include/kernel/filesystem/filesystem.hpp b/kernel/include/kernel/filesystem/filesystem.hpp
index 099caee..16c07ad 100644
--- a/kernel/include/kernel/filesystem/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/filesystem.hpp
@@ -71,7 +71,6 @@ namespace kernel::filesystem
   protected:
     kstd::shared_ptr<inode> m_root_inode{};
     kstd::shared_ptr<inode> m_backing_inode{};
-    kstd::vector<kstd::shared_ptr<inode>> m_inodes{};
   };
 
 }  // namespace kernel::filesystem
diff --git a/kernel/include/kernel/filesystem/vfs.hpp b/kernel/include/kernel/filesystem/vfs.hpp
index 2a9d5f7..678e645 100644
--- a/kernel/include/kernel/filesystem/vfs.hpp
+++ b/kernel/include/kernel/filesystem/vfs.hpp
@@ -52,11 +52,11 @@ namespace kernel::filesystem
     ~vfs() = default;
 
     /**
-    @brief Open a file by its @p path. This method resolves the path and creates an open file description.
+    @brief Open a file by its @p path. This method resolves the path and returns the corresponding dentry.
     @param path The path to the file to open.
-    @return A shared pointer to the open file description or a null pointer if the file could not be opened.
+    @return A shared pointer to the dentry or a null pointer if the file could not be opened.
     */
-    auto open(std::string_view path) -> kstd::shared_ptr<open_file_description>;
+    auto open(std::string_view path) -> kstd::shared_ptr<dentry>;
 
     /**
     @brief Mount a @p source path to a specific @p target path.