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

implement basic vfs

See merge request teachos/kernel!16

1 files changed, 14 insertions, 10 deletions

diff --git a/kernel/src/filesystem/ext2/ext2_filesystem.cpp b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
index 408b292..373c6a2 100644
--- a/kernel/src/filesystem/ext2/ext2_filesystem.cpp
+++ b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
@@ -1,8 +1,9 @@
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
 
 #include "kernel/devices/device.hpp"
+#include "kernel/filesystem/ext2/ext2_inode.hpp"
+#include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
-#include "kernel/filesystem/inode_metadata.hpp"
 
 #include <kstd/memory>
 
@@ -12,22 +13,25 @@ namespace filesystem::ext2
 {
   auto ext2_filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
   {
-    if (!device)
-    {
-      return -1;  // TODO BA-FS26 panic or errorcode?
-    }
-
-    m_device = device;
+    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};
+    // m_root_inode = inode{inode_kind::directory};
 
     // TODO BA-FS26 implement
+    m_root_inode = kstd::make_shared<ext2_inode>();
     return 0;
   }
 
-  auto ext2_filesystem::lookup(inode const & /*parent*/, std::string_view /*name*/) -> inode *
+  auto ext2_filesystem::lookup(kstd::shared_ptr<inode> const & /*parent*/, std::string_view name)
+      -> kstd::shared_ptr<inode>
   {
     // TODO BA-FS26 implement ext2 directory traversal and inode loading
-    return nullptr;
+    if (name == "dev")
+    {
+      // TODO BA-FS26 just for testing
+      return nullptr;
+    }
+
+    return kstd::make_shared<ext2_inode>();
   }
 }  // namespace filesystem::ext2