Rename ext2 filesystem files

5 files changed, 13 insertions, 14 deletions

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;