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

Refactor

See merge request teachos/kernel!18

3 files changed, 37 insertions, 37 deletions

diff --git a/kernel/src/filesystem/ext2/ext2_inode.cpp b/kernel/src/filesystem/ext2/ext2_inode.cpp
deleted file mode 100644
index 3cc0fb2..0000000
--- a/kernel/src/filesystem/ext2/ext2_inode.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "kernel/filesystem/ext2/ext2_inode.hpp"
-
-#include "kernel/filesystem/inode.hpp"
-
-#include <cstddef>
-
-namespace filesystem::ext2
-{
-  ext2_inode::ext2_inode()
-      : inode(inode_kind::regular)
-  {}
-
-  auto ext2_inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
-  {
-    // TODO BA-FS26 implement
-    return 0;
-  }
-
-  auto ext2_inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
-  {
-    // TODO BA-FS26 implement
-    return 0;
-  }
-}  // namespace filesystem::ext2
\ No newline at end of file
diff --git a/kernel/src/filesystem/ext2/ext2_filesystem.cpp b/kernel/src/filesystem/ext2/filesystem.cpp
index ea6fe0d..d951158 100644
--- a/kernel/src/filesystem/ext2/ext2_filesystem.cpp
+++ b/kernel/src/filesystem/ext2/filesystem.cpp
@@ -1,9 +1,9 @@
-#include "kernel/filesystem/ext2/ext2_filesystem.hpp"
+#include "kernel/filesystem/ext2/filesystem.hpp"
 
 #include "kernel/devices/block_device_utils.hpp"
 #include "kernel/devices/device.hpp"
-#include "kernel/filesystem/ext2/ext2_inode.hpp"
-#include "kernel/filesystem/ext2/ext2_superblock.hpp"
+#include "kernel/filesystem/ext2/inode.hpp"
+#include "kernel/filesystem/ext2/superblock.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
@@ -13,7 +13,7 @@
 #include <cstdint>
 #include <string_view>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   namespace
   {
@@ -34,31 +34,31 @@ namespace filesystem::ext2
     //   return (mode & S_IFMT) == S_IFDIR;
     // }
 
-    // auto get_block_size(ext2_superblock const & superblock) -> size_t
+    // auto get_block_size(superblock const & superblock) -> size_t
     // {
     //   return 1024U << superblock.log_block_size;
     // }
 
-    // auto get_inode_size(ext2_superblock const & superblock) -> size_t
+    // auto get_inode_size(superblock const & superblock) -> size_t
     // {
     //   return superblock.rev_level == 0 ? 128 : superblock.inode_size;
     // }
   }  // namespace
 
-  auto ext2_filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
+  auto filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
   {
-    filesystem::mount(device);  // TODO BA-FS26 error handling?
+    kernel::filesystem::filesystem::mount(device);  // TODO BA-FS26 error handling?
     // TODO BA-FS26 load proper root inode from ext2 metadata
     // m_root_inode = inode{inode_kind::directory};
 
     // TODO BA-FS26 implement
-    m_root_inode = kstd::make_shared<ext2_inode>();
+    m_root_inode = kstd::make_shared<inode>();
     // devices::block_device_utils::read(device, nullptr, 0, 0);  // TODO BA-FS26 just for testing
     return 0;
   }
 
-  auto ext2_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>
   {
     // TODO BA-FS26 implement ext2 directory traversal and inode loading
     if (name == "dev")
@@ -67,6 +67,6 @@ namespace filesystem::ext2
       return nullptr;
     }
 
-    return kstd::make_shared<ext2_inode>();
+    return kstd::make_shared<inode>();
   }
-}  // namespace filesystem::ext2
+}  // namespace kernel::filesystem::ext2
diff --git a/kernel/src/filesystem/ext2/inode.cpp b/kernel/src/filesystem/ext2/inode.cpp
new file mode 100644
index 0000000..b75969a
--- /dev/null
+++ b/kernel/src/filesystem/ext2/inode.cpp
@@ -0,0 +1,24 @@
+#include "kernel/filesystem/ext2/inode.hpp"
+
+#include "kernel/filesystem/inode.hpp"
+
+#include <cstddef>
+
+namespace kernel::filesystem::ext2
+{
+  inode::inode()
+      : kernel::filesystem::inode(inode_kind::regular)
+  {}
+
+  auto inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
+  {
+    // TODO BA-FS26 implement
+    return 0;
+  }
+
+  auto inode::write(void const * /*buffer*/, size_t /*offset*/, size_t /*size*/) -> size_t
+  {
+    // TODO BA-FS26 implement
+    return 0;
+  }
+}  // namespace kernel::filesystem::ext2
\ No newline at end of file