Rename devfs filesystem files

7 files changed, 42 insertions, 41 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 93ac322..f9e4a70 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -24,8 +24,8 @@ add_executable("kernel"
     "src/devices/storage/storage_management.cpp"
     "src/devices/storage/ram_disk/ram_disk_controller.cpp"
     "src/devices/storage/ram_disk/ram_disk_device.cpp"
-    "src/filesystem/devfs/devfs_filesystem.cpp"
-    "src/filesystem/devfs/devfs_root_inode.cpp"
+    "src/filesystem/devfs/filesystem.cpp"
+    "src/filesystem/devfs/inode.cpp"
     "src/filesystem/ext2/filesystem.cpp"
     "src/filesystem/ext2/inode.cpp"
     "src/filesystem/dentry.cpp"
diff --git a/kernel/include/kernel/filesystem/devfs/devfs_filesystem.hpp b/kernel/include/kernel/filesystem/devfs/filesystem.hpp
index 2330915..5ec6221 100644
--- a/kernel/include/kernel/filesystem/devfs/devfs_filesystem.hpp
+++ b/kernel/include/kernel/filesystem/devfs/filesystem.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVFS_DEVFS_FILESYSTEM_HPP
-#define TEACH_OS_KERNEL_FILESYSTEM_DEVFS_DEVFS_FILESYSTEM_HPP
+#ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVFS_FILESYSTEM_HPP
+#define TEACH_OS_KERNEL_FILESYSTEM_DEVFS_FILESYSTEM_HPP
 
 #include "kernel/devices/device.hpp"
 #include "kernel/filesystem/filesystem.hpp"
@@ -12,10 +12,11 @@
 
 namespace kernel::filesystem::devfs
 {
-  struct devfs_filesystem : filesystem
+  struct filesystem : kernel::filesystem::filesystem
   {
     auto mount(kstd::shared_ptr<devices::device> const & device) -> int override;
-    auto lookup(kstd::shared_ptr<inode> const & parent, std::string_view name) -> kstd::shared_ptr<inode> override;
+    auto lookup(kstd::shared_ptr<kernel::filesystem::inode> const & parent, std::string_view name)
+        -> kstd::shared_ptr<kernel::filesystem::inode> override;
 
   private:
     auto build_device_inode_table() -> void;
diff --git a/kernel/include/kernel/filesystem/devfs/devfs_root_inode.hpp b/kernel/include/kernel/filesystem/devfs/inode.hpp
index 206fc13..9c11edf 100644
--- a/kernel/include/kernel/filesystem/devfs/devfs_root_inode.hpp
+++ b/kernel/include/kernel/filesystem/devfs/inode.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVFS_DEVFS_ROOT_INODE_HPP
-#define TEACH_OS_KERNEL_FILESYSTEM_DEVFS_DEVFS_ROOT_INODE_HPP
+#ifndef TEACH_OS_KERNEL_FILESYSTEM_DEVFS_INODE_HPP
+#define TEACH_OS_KERNEL_FILESYSTEM_DEVFS_INODE_HPP
 
 #include "kernel/filesystem/inode.hpp"
 
@@ -7,9 +7,9 @@
 
 namespace kernel::filesystem::devfs
 {
-  struct devfs_root_inode : inode
+  struct inode : kernel::filesystem::inode
   {
-    devfs_root_inode();
+    inode();
 
     auto read(void * buffer, size_t offset, size_t size) const -> size_t override;
     auto write(void const * buffer, size_t offset, size_t size) -> size_t override;
diff --git a/kernel/src/filesystem/devfs/devfs_root_inode.cpp b/kernel/src/filesystem/devfs/devfs_root_inode.cpp
deleted file mode 100644
index a7308dc..0000000
--- a/kernel/src/filesystem/devfs/devfs_root_inode.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "kernel/filesystem/devfs/devfs_root_inode.hpp"
-
-#include "kernel/filesystem/inode.hpp"
-
-#include <cstddef>
-
-namespace kernel::filesystem::devfs
-{
-  devfs_root_inode::devfs_root_inode()
-      : inode(inode_kind::directory)
-  {}
-
-  auto devfs_root_inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
-  {
-    return 0;
-  }
-
-  auto devfs_root_inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
-  {
-    return 0;
-  }
-}  // namespace kernel::filesystem::devfs
\ No newline at end of file
diff --git a/kernel/src/filesystem/devfs/devfs_filesystem.cpp b/kernel/src/filesystem/devfs/filesystem.cpp
index df977b8..e7d0e13 100644
--- a/kernel/src/filesystem/devfs/devfs_filesystem.cpp
+++ b/kernel/src/filesystem/devfs/filesystem.cpp
@@ -1,8 +1,8 @@
-#include "kernel/filesystem/devfs/devfs_filesystem.hpp"
+#include "kernel/filesystem/devfs/filesystem.hpp"
 
 #include "kernel/devices/device.hpp"
 #include "kernel/devices/storage/storage_management.hpp"
-#include "kernel/filesystem/devfs/devfs_root_inode.hpp"
+#include "kernel/filesystem/devfs/inode.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/inode.hpp"
 
@@ -13,16 +13,16 @@
 
 namespace kernel::filesystem::devfs
 {
-  auto devfs_filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
+  auto filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
   {
-    m_root_inode = kstd::make_shared<devfs_root_inode>();
+    m_root_inode = kstd::make_shared<inode>();
     build_device_inode_table();
 
     return 0;
   }
 
-  auto devfs_filesystem::lookup(kstd::shared_ptr<inode> const & parent, std::string_view name)
-      -> kstd::shared_ptr<inode>
+  auto filesystem::lookup(kstd::shared_ptr<kernel::filesystem::inode> const & parent, std::string_view name)
+      -> kstd::shared_ptr<kernel::filesystem::inode>
   {
     if (!parent || !parent->is_directory())
     {
@@ -45,7 +45,7 @@ namespace kernel::filesystem::devfs
     return (it != m_inodes.end()) ? *it : nullptr;
   }
 
-  auto devfs_filesystem::build_device_inode_table() -> void
+  auto filesystem::build_device_inode_table() -> void
   {
     m_inodes.clear();
 
diff --git a/kernel/src/filesystem/devfs/inode.cpp b/kernel/src/filesystem/devfs/inode.cpp
new file mode 100644
index 0000000..52cf6fa
--- /dev/null
+++ b/kernel/src/filesystem/devfs/inode.cpp
@@ -0,0 +1,22 @@
+#include "kernel/filesystem/devfs/inode.hpp"
+
+#include "kernel/filesystem/inode.hpp"
+
+#include <cstddef>
+
+namespace kernel::filesystem::devfs
+{
+  inode::inode()
+      : kernel::filesystem::inode(inode_kind::directory)
+  {}
+
+  auto inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
+  {
+    return 0;
+  }
+
+  auto inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
+  {
+    return 0;
+  }
+}  // namespace kernel::filesystem::devfs
\ No newline at end of file
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 69740c3..fdad36c 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -4,7 +4,7 @@
 
 #include "kernel/devices/storage/storage_management.hpp"
 #include "kernel/filesystem/dentry.hpp"
-#include "kernel/filesystem/devfs/devfs_filesystem.hpp"
+#include "kernel/filesystem/devfs/filesystem.hpp"
 #include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/mount.hpp"
@@ -52,7 +52,7 @@ namespace kernel::filesystem
       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);
   }