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

Refactor

See merge request teachos/kernel!18

1 files changed, 10 insertions, 10 deletions

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 7a90531..06214d2 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -2,14 +2,14 @@
 
 #include "kapi/system.hpp"
 
-#include "kernel/devices/storage/storage_management.hpp"
+#include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/dentry.hpp"
-#include "kernel/filesystem/devfs/devfs_filesystem.hpp"
-#include "kernel/filesystem/ext2/ext2_filesystem.hpp"
+#include "kernel/filesystem/devfs/filesystem.hpp"
+#include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/mount.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
-#include "kernel/filesystem/rootfs/rootfs_filesystem.hpp"
+#include "kernel/filesystem/rootfs/filesystem.hpp"
 
 #include <kstd/memory>
 
@@ -17,7 +17,7 @@
 #include <ranges>
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   namespace
   {
@@ -37,22 +37,22 @@ namespace filesystem
 
   auto vfs::init_internal() -> void
   {
-    auto root_fs = kstd::make_shared<rootfs::rootfs_filesystem>();
+    auto root_fs = kstd::make_shared<rootfs::filesystem>();
     root_fs->mount(nullptr);
 
     auto root_fs_root_dentry = kstd::make_shared<dentry>(nullptr, root_fs->root_inode());
     m_mount_table.add_mount(kstd::make_shared<mount>(nullptr, root_fs_root_dentry, root_fs, ""));
 
-    auto storage_mgmt = devices::storage::storage_management::get();
+    auto storage_mgmt = devices::storage::management::get();
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
       // TODO BA-FS26 detect fs type from boot device and load corresponding fs, for now just assume ext2
-      auto boot_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
+      auto boot_root_fs = kstd::make_shared<ext2::filesystem>();
       boot_root_fs->mount(boot_device);
       do_mount_internal("/", root_fs_root_dentry, boot_root_fs);
     }
 
-    auto device_fs = kstd::make_shared<devfs::devfs_filesystem>();
+    auto device_fs = kstd::make_shared<devfs::filesystem>();
     device_fs->mount(nullptr);
     do_mount_internal("/dev", root_fs_root_dentry, device_fs);
   }
@@ -161,4 +161,4 @@ namespace filesystem
     return current_dentry;
   }
 
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file