fix build, refactoring

9 files changed, 32 insertions, 19 deletions

diff --git a/kernel/include/kernel/filesystem/devfs/filesystem.hpp b/kernel/include/kernel/filesystem/devfs/filesystem.hpp
index 29ae388..3edeabb 100644
--- a/kernel/include/kernel/filesystem/devfs/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/devfs/filesystem.hpp
@@ -2,6 +2,7 @@
 #define TEACH_OS_KERNEL_FILESYSTEM_DEVFS_FILESYSTEM_HPP
 
 #include "kapi/devices/device.hpp"
+
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
diff --git a/kernel/include/kernel/filesystem/ext2/filesystem.hpp b/kernel/include/kernel/filesystem/ext2/filesystem.hpp
index 176d83c..f6cd17f 100644
--- a/kernel/include/kernel/filesystem/ext2/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/ext2/filesystem.hpp
@@ -16,7 +16,7 @@ namespace kernel::filesystem::ext2
 {
   struct filesystem : kernel::filesystem::filesystem
   {
-    auto mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int;
+    auto mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int override;
     auto lookup(kstd::shared_ptr<kernel::filesystem::inode> const & parent, std::string_view name)
         -> kstd::shared_ptr<kernel::filesystem::inode> override;
 
diff --git a/kernel/include/kernel/filesystem/filesystem.hpp b/kernel/include/kernel/filesystem/filesystem.hpp
index 05f96dc..1c45377 100644
--- a/kernel/include/kernel/filesystem/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/filesystem.hpp
@@ -16,7 +16,9 @@ namespace kernel::filesystem
   {
     virtual ~filesystem() = default;
 
-    auto static mount(kstd::shared_ptr<kapi::devices::device> const & device) -> kstd::shared_ptr<filesystem>;
+    auto static probe_and_mount(kstd::shared_ptr<kapi::devices::device> const & device) -> kstd::shared_ptr<filesystem>;
+
+    virtual auto mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int;
     virtual auto lookup(kstd::shared_ptr<inode> const & parent, std::string_view name) -> kstd::shared_ptr<inode> = 0;
 
     [[nodiscard]] auto root_inode() const -> kstd::shared_ptr<inode> const &;
diff --git a/kernel/include/kernel/filesystem/rootfs/filesystem.hpp b/kernel/include/kernel/filesystem/rootfs/filesystem.hpp
index 5632d86..7931d87 100644
--- a/kernel/include/kernel/filesystem/rootfs/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/rootfs/filesystem.hpp
@@ -2,6 +2,7 @@
 #define TEACH_OS_KERNEL_FILESYSTEM_ROOTFS_FILESYSTEM_HPP
 
 #include "kapi/devices/device.hpp"
+
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
diff --git a/kernel/src/filesystem/ext2/filesystem.cpp b/kernel/src/filesystem/ext2/filesystem.cpp
index a3425b5..0ebb243 100644
--- a/kernel/src/filesystem/ext2/filesystem.cpp
+++ b/kernel/src/filesystem/ext2/filesystem.cpp
@@ -5,6 +5,7 @@
 #include "kernel/devices/block_device_utils.hpp"
 #include "kernel/filesystem/ext2/inode.hpp"
 #include "kernel/filesystem/ext2/superblock.hpp"
+#include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 
 #include <kstd/memory>
@@ -21,23 +22,23 @@ namespace kernel::filesystem::ext2
     constexpr uint16_t EXT2_MAGIC = 0xEF53;
 
     // Mode bits
-    constexpr uint16_t S_IFMT = 0xF000;
-    constexpr uint16_t S_IFREG = 0x8000;
-    constexpr uint16_t S_IFDIR = 0x4000;
-
-    auto S_ISREG(uint16_t mode) -> bool
-    {
-      return (mode & S_IFMT) == S_IFREG;
-    }
-    auto S_ISDIR(uint16_t mode) -> bool
-    {
-      return (mode & S_IFMT) == S_IFDIR;
-    }
+    // constexpr uint16_t S_IFMT = 0xF000;
+    // constexpr uint16_t S_IFREG = 0x8000;
+    // constexpr uint16_t S_IFDIR = 0x4000;
+
+    // auto S_ISREG(uint16_t mode) -> bool
+    // {
+    //   return (mode & S_IFMT) == S_IFREG;
+    // }
+    // auto S_ISDIR(uint16_t mode) -> bool
+    // {
+    //   return (mode & S_IFMT) == S_IFDIR;
+    // }
   }  // namespace
 
   auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int
   {
-    m_device = device;
+    kernel::filesystem::filesystem::mount(device);
 
     kernel::devices::block_device_utils::read(m_device, &m_superblock, SUPERBLOCK_OFFSET, sizeof(m_superblock));
 
diff --git a/kernel/src/filesystem/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp
index e0c760f..a06eb80 100644
--- a/kernel/src/filesystem/filesystem.cpp
+++ b/kernel/src/filesystem/filesystem.cpp
@@ -19,7 +19,8 @@ namespace kernel::filesystem
     };
   }  // namespace
 
-  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> kstd::shared_ptr<filesystem>
+  auto filesystem::probe_and_mount(kstd::shared_ptr<kapi::devices::device> const & device)
+      -> kstd::shared_ptr<filesystem>
   {
     if (!device)
     {
@@ -38,6 +39,12 @@ namespace kernel::filesystem
     kapi::system::panic("[FILESYSTEM] cannot mount filesystem: no suitable filesystem found on device.");
   }
 
+  auto filesystem::mount(kstd::shared_ptr<kapi::devices::device> const & device) -> int
+  {
+    m_device = device;
+    return 0;
+  }
+
   auto filesystem::root_inode() const -> kstd::shared_ptr<inode> const &
   {
     return m_root_inode;
diff --git a/kernel/src/filesystem/rootfs/filesystem.cpp b/kernel/src/filesystem/rootfs/filesystem.cpp
index 37bf588..a7c746e 100644
--- a/kernel/src/filesystem/rootfs/filesystem.cpp
+++ b/kernel/src/filesystem/rootfs/filesystem.cpp
@@ -1,6 +1,7 @@
 #include "kernel/filesystem/rootfs/filesystem.hpp"
 
 #include "kapi/devices/device.hpp"
+
 #include "kernel/filesystem/inode.hpp"
 #include "kernel/filesystem/rootfs/inode.hpp"
 
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 66aa91e..d611fc9 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -45,7 +45,7 @@ namespace kernel::filesystem
     auto storage_mgmt = devices::storage::management::get();
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
-      auto boot_root_fs = kernel::filesystem::filesystem::mount(boot_device);
+      auto boot_root_fs = kernel::filesystem::filesystem::probe_and_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 382f12d..8df6767 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -8,8 +8,8 @@
 
 #include "kernel/devices/storage/management.hpp"
 #include "kernel/filesystem/device_inode.hpp"
-#include "kernel/filesystem/ext2/filesystem.hpp"
 #include "kernel/filesystem/file_descriptor_table.hpp"
+#include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
 #include "kernel/filesystem/vfs.hpp"
 #include "kernel/memory.hpp"
@@ -131,7 +131,7 @@ auto test_file_lookup() -> void
   }
 
   auto device = storage_mgmt.device_by_major_minor(1, 16);
-  auto new_filesystem = kernel::filesystem::filesystem::mount(device);
+  auto new_filesystem = kernel::filesystem::filesystem::probe_and_mount(device);
 
   if (vfs.do_mount("/a/b", new_filesystem) != 0)
   {