Rename rootfs filesystem files

7 files changed, 53 insertions, 52 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index f9e4a70..3dbc0f4 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -36,8 +36,8 @@ add_executable("kernel"
     "src/filesystem/mount_table.cpp"
     "src/filesystem/mount.cpp"
     "src/filesystem/open_file_description.cpp"
-    "src/filesystem/rootfs/rootfs_filesystem.cpp"
-    "src/filesystem/rootfs/rootfs_inode.cpp"
+    "src/filesystem/rootfs/filesystem.cpp"
+    "src/filesystem/rootfs/inode.cpp"
     "src/filesystem/vfs.cpp"
 )
 
diff --git a/kernel/include/kernel/filesystem/rootfs/rootfs_filesystem.hpp b/kernel/include/kernel/filesystem/rootfs/filesystem.hpp
index b91f728..b1f33a9 100644
--- a/kernel/include/kernel/filesystem/rootfs/rootfs_filesystem.hpp
+++ b/kernel/include/kernel/filesystem/rootfs/filesystem.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_ROOTFS_FILESYSTEM_HPP
-#define TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_ROOTFS_FILESYSTEM_HPP
+#ifndef TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_FILESYSTEM_HPP
+#define TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_FILESYSTEM_HPP
 
 #include "kernel/devices/device.hpp"
 #include "kernel/filesystem/filesystem.hpp"
@@ -13,11 +13,12 @@
 
 namespace kernel::filesystem::rootfs
 {
-  struct rootfs_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;
   };
 }  // namespace kernel::filesystem::rootfs
 
-#endif
+#endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/rootfs/rootfs_inode.hpp b/kernel/include/kernel/filesystem/rootfs/inode.hpp
index 26e7f88..24d3e6b 100644
--- a/kernel/include/kernel/filesystem/rootfs/rootfs_inode.hpp
+++ b/kernel/include/kernel/filesystem/rootfs/inode.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_ROOTFS_INODE_HPP
-#define TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_ROOTFS_INODE_HPP
+#ifndef TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_INODE_HPP
+#define TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_INODE_HPP
 
 #include "kernel/filesystem/inode.hpp"
 
@@ -13,9 +13,9 @@
 
 namespace kernel::filesystem::rootfs
 {
-  struct rootfs_inode : inode
+  struct inode : kernel::filesystem::inode
   {
-    rootfs_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;
@@ -24,7 +24,7 @@ namespace kernel::filesystem::rootfs
     auto lookup_child(std::string_view name) -> kstd::shared_ptr<inode>;
 
   private:
-    kstd::vector<std::pair<kstd::string, kstd::shared_ptr<rootfs_inode>>> m_children;
+    kstd::vector<std::pair<kstd::string, kstd::shared_ptr<inode>>> m_children;
   };
 }  // namespace kernel::filesystem::rootfs
 
diff --git a/kernel/src/filesystem/rootfs/filesystem.cpp b/kernel/src/filesystem/rootfs/filesystem.cpp
new file mode 100644
index 0000000..0133612
--- /dev/null
+++ b/kernel/src/filesystem/rootfs/filesystem.cpp
@@ -0,0 +1,29 @@
+#include "kernel/filesystem/rootfs/filesystem.hpp"
+
+#include "kernel/devices/device.hpp"
+#include "kernel/filesystem/inode.hpp"
+#include "kernel/filesystem/rootfs/inode.hpp"
+
+#include <kstd/memory>
+
+#include <string_view>
+
+namespace kernel::filesystem::rootfs
+{
+  auto filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
+  {
+    auto rfs_inode = kstd::make_shared<inode>();
+    rfs_inode->add_child("dev");
+    m_root_inode = rfs_inode;
+
+    return 0;
+  }
+
+  auto filesystem::lookup(kstd::shared_ptr<kernel::filesystem::inode> const & parent, std::string_view name)
+      -> kstd::shared_ptr<kernel::filesystem::inode>
+  {
+    if (auto * rfs_inode = static_cast<inode *>(parent.get()))
+      return rfs_inode->lookup_child(name);
+    return nullptr;
+  }
+}  // namespace kernel::filesystem::rootfs
diff --git a/kernel/src/filesystem/rootfs/rootfs_inode.cpp b/kernel/src/filesystem/rootfs/inode.cpp
index f44f06c..3ca9c02 100644
--- a/kernel/src/filesystem/rootfs/rootfs_inode.cpp
+++ b/kernel/src/filesystem/rootfs/inode.cpp
@@ -1,7 +1,7 @@
-#include "kernel/filesystem/rootfs/rootfs_inode.hpp"
-
 #include "kernel/filesystem/inode.hpp"
 
+#include "kernel/filesystem/rootfs/inode.hpp"
+
 #include <kstd/memory>
 #include <kstd/string>
 
@@ -12,26 +12,26 @@
 
 namespace kernel::filesystem::rootfs
 {
-  rootfs_inode::rootfs_inode()
-      : inode(inode_kind::directory)
+  inode::inode()
+      : kernel::filesystem::inode(inode_kind::directory)
   {}
 
-  auto rootfs_inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
+  auto inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
   {
     return 0;
   }
 
-  auto rootfs_inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
+  auto inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
   {
     return 0;
   }
 
-  auto rootfs_inode::add_child(std::string_view name) -> void
+  auto inode::add_child(std::string_view name) -> void
   {
-    m_children.push_back(std::make_pair(kstd::string{name}, kstd::make_shared<rootfs_inode>()));
+    m_children.push_back(std::make_pair(kstd::string{name}, kstd::make_shared<inode>()));
   }
 
-  auto rootfs_inode::lookup_child(std::string_view name) -> kstd::shared_ptr<inode>
+  auto inode::lookup_child(std::string_view name) -> kstd::shared_ptr<inode>
   {
     auto it = std::ranges::find_if(m_children, [&](auto const & pair) { return pair.first == name; });
     return (it != m_children.end()) ? it->second : nullptr;
diff --git a/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp b/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
deleted file mode 100644
index 804e211..0000000
--- a/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "kernel/filesystem/rootfs/rootfs_filesystem.hpp"
-
-#include "kernel/devices/device.hpp"
-#include "kernel/filesystem/inode.hpp"
-#include "kernel/filesystem/rootfs/rootfs_inode.hpp"
-
-#include <kstd/memory>
-
-#include <string_view>
-
-namespace kernel::filesystem::rootfs
-{
-  auto rootfs_filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
-  {
-    auto rfs_inode = kstd::make_shared<rootfs_inode>();
-    rfs_inode->add_child("dev");
-    m_root_inode = rfs_inode;
-
-    return 0;
-  }
-
-  auto rootfs_filesystem::lookup(kstd::shared_ptr<inode> const & parent, std::string_view name)
-      -> kstd::shared_ptr<inode>
-  {
-    if (auto * rfs_inode = static_cast<rootfs_inode *>(parent.get()))
-      return rfs_inode->lookup_child(name);
-    return nullptr;
-  }
-}  // namespace kernel::filesystem::rootfs
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index fdad36c..bee68e6 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -9,7 +9,7 @@
 #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>
 
@@ -37,7 +37,7 @@ namespace kernel::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());