Rename ext2 filesystem files

11 files changed, 54 insertions, 55 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 5cc6f2d..93ac322 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -26,8 +26,8 @@ add_executable("kernel"
     "src/devices/storage/ram_disk/ram_disk_device.cpp"
     "src/filesystem/devfs/devfs_filesystem.cpp"
     "src/filesystem/devfs/devfs_root_inode.cpp"
-    "src/filesystem/ext2/ext2_filesystem.cpp"
-    "src/filesystem/ext2/ext2_inode.cpp"
+    "src/filesystem/ext2/filesystem.cpp"
+    "src/filesystem/ext2/inode.cpp"
     "src/filesystem/dentry.cpp"
     "src/filesystem/device_inode.cpp"
     "src/filesystem/file_descriptor_table.cpp"
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_block_group_descriptor.hpp b/kernel/include/kernel/filesystem/ext2/block_group_descriptor.hpp
index 0de7428..a23c045 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_block_group_descriptor.hpp
+++ b/kernel/include/kernel/filesystem/ext2/block_group_descriptor.hpp
@@ -1,12 +1,12 @@
-#ifndef EXT2_BLOCK_GROUP_DESCRIPTOR_HPP
-#define EXT2_BLOCK_GROUP_DESCRIPTOR_HPP
+#ifndef TEACH_OS_KERNEL_FILESYSTEM_EXT2_BLOCK_GROUP_DESCRIPTOR_HPP
+#define TEACH_OS_KERNEL_FILESYSTEM_EXT2_BLOCK_GROUP_DESCRIPTOR_HPP
 
 #include <array>
 #include <cstdint>
 
 namespace kernel::filesystem::ext2
 {
-  struct ext2_block_group_descriptor
+  struct block_group_descriptor
   {
     uint32_t block_bitmap;
     uint32_t inode_bitmap;
@@ -18,4 +18,4 @@ namespace kernel::filesystem::ext2
     std::array<uint8_t, 12> reserved;  // NOLINT(readability-magic-numbers)
   };
 }  // namespace kernel::filesystem::ext2
-#endif  // EXT2_BLOCK_GROUP_DESCRIPTOR_HPP
\ No newline at end of file
+#endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp b/kernel/include/kernel/filesystem/ext2/filesystem.hpp
index 753aea1..763cd1d 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp
+++ b/kernel/include/kernel/filesystem/ext2/filesystem.hpp
@@ -11,12 +11,11 @@
 
 namespace kernel::filesystem::ext2
 {
-  struct ext2_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;
-
-  private:
+    auto lookup(kstd::shared_ptr<kernel::filesystem::inode> const & parent, std::string_view name)
+        -> kstd::shared_ptr<kernel::filesystem::inode> override;
   };
 }  // namespace kernel::filesystem::ext2
 
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_inode.hpp b/kernel/include/kernel/filesystem/ext2/inode.hpp
index 2054227..2c27c17 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_inode.hpp
+++ b/kernel/include/kernel/filesystem/ext2/inode.hpp
@@ -11,9 +11,9 @@
 
 namespace kernel::filesystem::ext2
 {
-  struct ext2_inode : inode
+  struct inode : kernel::filesystem::inode
   {
-    ext2_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/include/kernel/filesystem/ext2/ext2_linked_directory_entry.hpp b/kernel/include/kernel/filesystem/ext2/linked_directory_entry.hpp
index 84e47e8..8dd42a1 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_linked_directory_entry.hpp
+++ b/kernel/include/kernel/filesystem/ext2/linked_directory_entry.hpp
@@ -6,7 +6,7 @@
 
 namespace kernel::filesystem::ext2
 {
-  struct ext2_linked_directory_entry
+  struct linked_directory_entry
   {
     uint32_t inode;
     uint16_t rec_len;
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_superblock.hpp b/kernel/include/kernel/filesystem/ext2/superblock.hpp
index aa93e68..8600b4c 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_superblock.hpp
+++ b/kernel/include/kernel/filesystem/ext2/superblock.hpp
@@ -1,12 +1,12 @@
-#ifndef EXT2_SUPERBLOCK_HPP
-#define EXT2_SUPERBLOCK_HPP
+#ifndef TEACH_OS_KERNEL_FILESYSTEM_EXT2_SUPERBLOCK_HPP
+#define TEACH_OS_KERNEL_FILESYSTEM_EXT2_SUPERBLOCK_HPP
 
 #include <array>
 #include <cstdint>
 
 namespace kernel::filesystem::ext2
 {
-  struct ext2_superblock
+  struct superblock
   {
     uint32_t inodes_count;
     uint32_t blocks_count;
diff --git a/kernel/src/filesystem/ext2/ext2_inode.cpp b/kernel/src/filesystem/ext2/ext2_inode.cpp
deleted file mode 100644
index 142502e..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 kernel::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 kernel::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 036b80e..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"
 
@@ -34,31 +34,31 @@ namespace kernel::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 kernel::filesystem::ext2
       return nullptr;
     }
 
-    return kstd::make_shared<ext2_inode>();
+    return kstd::make_shared<inode>();
   }
 }  // 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
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 2dbdb12..69740c3 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -5,7 +5,7 @@
 #include "kernel/devices/storage/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/ext2/filesystem.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/mount.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
@@ -47,7 +47,7 @@ namespace kernel::filesystem
     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);
     }
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index 2dd9fd9..ff73985 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -7,7 +7,7 @@
 
 #include "kernel/devices/storage/storage_management.hpp"
 #include "kernel/filesystem/device_inode.hpp"
-#include "kernel/filesystem/ext2/ext2_filesystem.hpp"
+#include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/file_descriptor_table.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
 #include "kernel/filesystem/vfs.hpp"
@@ -126,7 +126,7 @@ auto test_file_lookup() -> void
     kstd::os::panic("test code failed");
   }
 
-  auto new_filesystem = kstd::make_shared<kernel::filesystem::ext2::ext2_filesystem>();
+  auto new_filesystem = kstd::make_shared<kernel::filesystem::ext2::filesystem>();
   auto device = storage_mgmt.device_by_major_minor(1, 16);
   new_filesystem->mount(device);
   if (vfs.do_mount("/a/b", new_filesystem) != 0)