From 8d3471f1d160d301f9d990455bd8c63450df1cf3 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Thu, 19 Mar 2026 21:59:31 +0100
Subject: remove inode metadata

---
 kernel/src/filesystem/vfs.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 4e0b6bf..188da6d 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -6,6 +6,7 @@
 #include "kernel/devices/storage/storage_management.hpp"
 #include "kernel/filesystem/custody.hpp"
 #include "kernel/filesystem/device_file.hpp"
+#include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
 #include "kernel/filesystem/inode.hpp"
 #include "kernel/filesystem/inode_file.hpp"
@@ -72,7 +73,8 @@ namespace filesystem
       auto node = custody->get_inode();
       if (node->is_device())
       {
-        auto current_device_file = kstd::make_shared<device_file>(node->backing_device());
+        auto device_node = static_cast<device_inode *>(node.get());
+        auto current_device_file = kstd::make_shared<device_file>(device_node->backing_device());
         current_device_file->open();
         return open_file_description{current_device_file};
       }
@@ -92,7 +94,7 @@ namespace filesystem
       kapi::system::panic("[FILESYSTEM] make_device_node called with null device.");
     }
 
-    m_device_nodes.push_back(device_node_entry{device->name(), kstd::make_shared<inode>(device)});
+    m_device_nodes.push_back(device_node_entry{device->name(), kstd::make_shared<device_inode>(device)});
   }
 
   auto vfs::resolve_path(std::string_view path) -> std::optional<custody>
-- 
cgit v1.2.3


From 09e3d0cb2272e7eabd79a320c17c58124515d427 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Thu, 19 Mar 2026 22:58:31 +0100
Subject: first try to simplify the architecture (remove redundant inode_file
 and open() methods), add ext2_file placeholder struct

---
 kernel/src/filesystem/vfs.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 188da6d..4b0c7d7 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -5,11 +5,8 @@
 #include "kernel/devices/device.hpp"
 #include "kernel/devices/storage/storage_management.hpp"
 #include "kernel/filesystem/custody.hpp"
-#include "kernel/filesystem/device_file.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
-#include "kernel/filesystem/inode.hpp"
-#include "kernel/filesystem/inode_file.hpp"
 #include "kernel/filesystem/mount.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
 
@@ -71,16 +68,13 @@ namespace filesystem
     if (auto custody = resolve_path(path))
     {
       auto node = custody->get_inode();
-      if (node->is_device())
+
+      auto current_inode_file = node->open_file();
+      if (!current_inode_file)
       {
-        auto device_node = static_cast<device_inode *>(node.get());
-        auto current_device_file = kstd::make_shared<device_file>(device_node->backing_device());
-        current_device_file->open();
-        return open_file_description{current_device_file};
+        kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
       }
 
-      auto current_inode_file = kstd::make_shared<inode_file>(node);
-      current_inode_file->open();
       return open_file_description{current_inode_file};
     }
 
-- 
cgit v1.2.3


From 91feb8a2a70af1915c8cfa4ee7d95b6e276f5c02 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Fri, 20 Mar 2026 21:51:51 +0100
Subject: small refactoring

---
 kernel/src/filesystem/vfs.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 4b0c7d7..1bc9ae6 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -69,13 +69,12 @@ namespace filesystem
     {
       auto node = custody->get_inode();
 
-      auto current_inode_file = node->open_file();
-      if (!current_inode_file)
+      if (auto current_inode_file = node->open_file();)
       {
-        kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
+        return open_file_description{current_inode_file};
       }
 
-      return open_file_description{current_inode_file};
+      kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
     }
 
     return std::nullopt;
-- 
cgit v1.2.3


From a396b71827a24f9d6c8010fd85b9afd9d86b6e2a Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Fri, 20 Mar 2026 22:13:36 +0100
Subject: implement first draft of a do_mount function

---
 kernel/src/filesystem/vfs.cpp | 49 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 1bc9ae6..febb844 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -36,13 +36,12 @@ namespace filesystem
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
       active_vfs->m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
-      if (active_vfs->m_root_fs->mount(boot_device) != 0)
+      if (active_vfs->do_mount("/", active_vfs->m_root_fs) != 0)
       {
         kapi::system::panic("[FILESYSTEM] Failed to mount root filesystem.");
       }
 
-      active_vfs->m_root_mount = mount{"/", active_vfs->m_root_fs};
-
+      // TODO BA-FS26 use do_mount when tempdevfs is implemented -> just call /dev/ with all devices in devtempfs
       std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto controller) {
         std::ranges::for_each(controller->all_devices(), [&](auto device) { active_vfs->make_device_node(device); });
       });
@@ -69,8 +68,9 @@ namespace filesystem
     {
       auto node = custody->get_inode();
 
-      if (auto current_inode_file = node->open_file();)
+      if (auto current_inode_file = node->open_file())
       {
+        // TODO BA-FS26 return shared_ptr?
         return open_file_description{current_inode_file};
       }
 
@@ -80,6 +80,45 @@ namespace filesystem
     return std::nullopt;
   }
 
+  auto vfs::do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & filesystem) -> int
+  {
+    if (!filesystem)
+    {
+      return -1;  // TODO BA-FS26 panic or errorcode?
+    }
+
+    if (path.empty() || path.front() != '/')
+    {
+      return -1;  // TODO BA-FS26 panic or errorcode?
+    }
+
+    // TODO BA-FS26 better path validation
+    if ((path.size() > 1 && path.back() == '/') || path.find("//") != std::string_view::npos)
+    {
+      return -1;  // TODO BA-FS26 panic or errorcode?
+    }
+
+    if (path == "/")
+    {
+      m_root_fs = filesystem;
+      m_root_mount = mount{"/", filesystem};
+      return 0;
+    }
+
+    auto existing_mount =
+        std::ranges::find_if(m_mounts, [&](auto const & existing) { return existing.path() == path; });
+    if (existing_mount != m_mounts.end())
+    {
+      *existing_mount = mount{path, filesystem};
+    }
+    else
+    {
+      m_mounts.push_back(mount{path, filesystem});
+    }
+
+    return 0;
+  }
+
   auto vfs::make_device_node(kstd::shared_ptr<devices::device> const & device) -> void
   {
     if (!device)
@@ -94,6 +133,8 @@ namespace filesystem
   {
     // TODO BA-FS26 implement real path resolution with mounts and directories etc.
     // For now, just support device nodes at /dev/<device_name>.
+    // TODO BA-FS26 better path validation
+    // TODO BA-FS26 implement a path parser (maybe in libs?) and use it here and in do_mount
 
     constexpr auto device_prefix = std::string_view{"/dev/"};
     if (path.starts_with(device_prefix))
-- 
cgit v1.2.3


From be44d4b778bb7c3a947af4cae610ecc3b8851672 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Fri, 20 Mar 2026 22:27:26 +0100
Subject: use kstd::shared_ptr instead of std::optional for
 open_file_descriptions

---
 kernel/src/filesystem/vfs.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index febb844..a3e554e 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -7,6 +7,7 @@
 #include "kernel/filesystem/custody.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
+#include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/mount.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
 
@@ -62,7 +63,7 @@ namespace filesystem
     return *active_vfs;
   }
 
-  auto vfs::open(std::string_view path) -> std::optional<open_file_description>
+  auto vfs::open(std::string_view path) -> kstd::shared_ptr<open_file_description>
   {
     if (auto custody = resolve_path(path))
     {
@@ -70,14 +71,13 @@ namespace filesystem
 
       if (auto current_inode_file = node->open_file())
       {
-        // TODO BA-FS26 return shared_ptr?
-        return open_file_description{current_inode_file};
+        return kstd::make_shared<open_file_description>(current_inode_file);
       }
 
       kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
     }
 
-    return std::nullopt;
+    return nullptr;
   }
 
   auto vfs::do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & filesystem) -> int
-- 
cgit v1.2.3


From 90452b752688110db2edc8d5dccdf0d6e0face5f Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Fri, 20 Mar 2026 23:17:11 +0100
Subject: fix build

---
 kernel/src/filesystem/vfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index a3e554e..ee5fd9b 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -93,7 +93,7 @@ namespace filesystem
     }
 
     // TODO BA-FS26 better path validation
-    if ((path.size() > 1 && path.back() == '/') || path.find("//") != std::string_view::npos)
+    if ((path.size() > 1 && path.back() == '/'))
     {
       return -1;  // TODO BA-FS26 panic or errorcode?
     }
-- 
cgit v1.2.3


From ba63fbfc2bb43a6f0f05b6b49fd51fd6c89a0861 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sat, 21 Mar 2026 00:28:17 +0100
Subject: refactor file and inode architecture again

---
 kernel/src/filesystem/vfs.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index ee5fd9b..5330b82 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -34,6 +34,7 @@ namespace filesystem
     active_vfs.emplace(vfs{});
 
     auto storage_mgmt = devices::storage::storage_management::get();
+    // TODO BA-FS26 fix mounting boot_device
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
       active_vfs->m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
@@ -69,9 +70,9 @@ namespace filesystem
     {
       auto node = custody->get_inode();
 
-      if (auto current_inode_file = node->open_file())
+      if (auto opened_file = node->open_file(node))
       {
-        return kstd::make_shared<open_file_description>(current_inode_file);
+        return kstd::make_shared<open_file_description>(opened_file);
       }
 
       kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
-- 
cgit v1.2.3


From ffb2accb09a013d8da16acd824c846bc1acfd8e4 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sat, 21 Mar 2026 10:52:46 +0100
Subject: use enable_shared_from_this instead of self invocation method

---
 kernel/src/filesystem/vfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 5330b82..2316de0 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -70,7 +70,7 @@ namespace filesystem
     {
       auto node = custody->get_inode();
 
-      if (auto opened_file = node->open_file(node))
+      if (auto opened_file = node->open_file())
       {
         return kstd::make_shared<open_file_description>(opened_file);
       }
-- 
cgit v1.2.3


From 6c172389b562a08a6540574d6fbdf6a5bdce37b8 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sat, 21 Mar 2026 16:22:23 +0100
Subject: simplify architecture again

---
 kernel/src/filesystem/vfs.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 2316de0..86991ea 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -68,11 +68,9 @@ namespace filesystem
   {
     if (auto custody = resolve_path(path))
     {
-      auto node = custody->get_inode();
-
-      if (auto opened_file = node->open_file())
+      if (auto node = custody->get_inode())
       {
-        return kstd::make_shared<open_file_description>(opened_file);
+        return kstd::make_shared<open_file_description>(node);
       }
 
       kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
-- 
cgit v1.2.3


From 9d23a9fb6ae774bf3b1345d0b7adcb88f9627dc0 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sat, 21 Mar 2026 16:35:01 +0100
Subject: refactoring, node cannot be null

---
 kernel/src/filesystem/vfs.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 86991ea..c448618 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -68,12 +68,7 @@ namespace filesystem
   {
     if (auto custody = resolve_path(path))
     {
-      if (auto node = custody->get_inode())
-      {
-        return kstd::make_shared<open_file_description>(node);
-      }
-
-      kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
+      return kstd::make_shared<open_file_description>(custody->get_inode());
     }
 
     return nullptr;
-- 
cgit v1.2.3


From ac3510bb9f696869f059ecd4ece2c6970fa63b6c Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sat, 21 Mar 2026 23:57:49 +0100
Subject: implement device names with kstd::string

---
 kernel/src/filesystem/vfs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index c448618..1bd6fb5 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -120,7 +120,7 @@ namespace filesystem
       kapi::system::panic("[FILESYSTEM] make_device_node called with null device.");
     }
 
-    m_device_nodes.push_back(device_node_entry{device->name(), kstd::make_shared<device_inode>(device)});
+    m_device_nodes.push_back(device_node_entry{device->name().view(), kstd::make_shared<device_inode>(device)});
   }
 
   auto vfs::resolve_path(std::string_view path) -> std::optional<custody>
-- 
cgit v1.2.3


From f90cbdaa91b1b7a4752db3f159ce2524696cff9f Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Mon, 23 Mar 2026 09:03:27 +0100
Subject: Rename custody to dentry and add children

---
 kernel/src/filesystem/vfs.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 1bd6fb5..a111f23 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -4,7 +4,7 @@
 
 #include "kernel/devices/device.hpp"
 #include "kernel/devices/storage/storage_management.hpp"
-#include "kernel/filesystem/custody.hpp"
+#include "kernel/filesystem/dentry.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
 #include "kernel/filesystem/filesystem.hpp"
@@ -66,9 +66,9 @@ namespace filesystem
 
   auto vfs::open(std::string_view path) -> kstd::shared_ptr<open_file_description>
   {
-    if (auto custody = resolve_path(path))
+    if (auto dentry = resolve_path(path))
     {
-      return kstd::make_shared<open_file_description>(custody->get_inode());
+      return kstd::make_shared<open_file_description>(dentry->get_inode());
     }
 
     return nullptr;
@@ -100,14 +100,14 @@ namespace filesystem
     }
 
     auto existing_mount =
-        std::ranges::find_if(m_mounts, [&](auto const & existing) { return existing.path() == path; });
-    if (existing_mount != m_mounts.end())
+        std::ranges::find_if(m_mount_table, [&](auto const & existing) { return existing.path() == path; });
+    if (existing_mount != m_mount_table.end())
     {
       *existing_mount = mount{path, filesystem};
     }
     else
     {
-      m_mounts.push_back(mount{path, filesystem});
+      m_mount_table.push_back(mount{path, filesystem});
     }
 
     return 0;
@@ -123,7 +123,7 @@ namespace filesystem
     m_device_nodes.push_back(device_node_entry{device->name().view(), kstd::make_shared<device_inode>(device)});
   }
 
-  auto vfs::resolve_path(std::string_view path) -> std::optional<custody>
+  auto vfs::resolve_path(std::string_view path) -> std::optional<dentry>
   {
     // TODO BA-FS26 implement real path resolution with mounts and directories etc.
     // For now, just support device nodes at /dev/<device_name>.
@@ -140,7 +140,7 @@ namespace filesystem
 
       if (entry != m_device_nodes.end())
       {
-        return custody{nullptr, entry->value().node};
+        return dentry{nullptr, entry->value().node};
       }
 
       return std::nullopt;
-- 
cgit v1.2.3


From d70e2df0885a844d47b6498bf2c710fb9730b364 Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Mon, 23 Mar 2026 09:49:10 +0100
Subject: Add dentry structure

---
 kernel/src/filesystem/vfs.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index a111f23..2c4a4d5 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -38,10 +38,11 @@ namespace filesystem
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
       active_vfs->m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
-      if (active_vfs->do_mount("/", active_vfs->m_root_fs) != 0)
-      {
-        kapi::system::panic("[FILESYSTEM] Failed to mount root filesystem.");
-      }
+      active_vfs->m_root_dentry = kstd::make_shared<dentry>(nullptr, active_vfs->m_root_fs->root_inode());
+      // if (active_vfs->do_mount("/", active_vfs->m_root_fs) != 0)
+      // {
+      //   kapi::system::panic("[FILESYSTEM] Failed to mount root filesystem.");
+      // }
 
       // TODO BA-FS26 use do_mount when tempdevfs is implemented -> just call /dev/ with all devices in devtempfs
       std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto controller) {
@@ -92,12 +93,12 @@ namespace filesystem
       return -1;  // TODO BA-FS26 panic or errorcode?
     }
 
-    if (path == "/")
-    {
-      m_root_fs = filesystem;
-      m_root_mount = mount{"/", filesystem};
-      return 0;
-    }
+    // if (path == "/")
+    // {
+    //   m_root_fs = filesystem;
+    //   m_root_mount = mount{"/", filesystem};
+    //   return 0;
+    // }
 
     auto existing_mount =
         std::ranges::find_if(m_mount_table, [&](auto const & existing) { return existing.path() == path; });
-- 
cgit v1.2.3


From 7173e5ba354dccc4b5d5fea119b946f28bc5b08f Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Mon, 23 Mar 2026 20:22:43 +0100
Subject: Refactor move init logic into member function

---
 kernel/src/filesystem/vfs.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 2c4a4d5..ece3080 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -32,21 +32,28 @@ namespace filesystem
     }
 
     active_vfs.emplace(vfs{});
+    active_vfs->init_internal();
+  }
 
+  auto vfs::init_internal() -> void
+  {
     auto storage_mgmt = devices::storage::storage_management::get();
     // TODO BA-FS26 fix mounting boot_device
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
-      active_vfs->m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
-      active_vfs->m_root_dentry = kstd::make_shared<dentry>(nullptr, active_vfs->m_root_fs->root_inode());
-      // if (active_vfs->do_mount("/", active_vfs->m_root_fs) != 0)
+      m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
+
+      m_root_fs->mount(boot_device);
+
+      m_root_dentry = kstd::make_shared<dentry>(nullptr, m_root_fs->root_inode());
+      // if (do_mount("/", m_root_fs) != 0)
       // {
       //   kapi::system::panic("[FILESYSTEM] Failed to mount root filesystem.");
       // }
 
       // TODO BA-FS26 use do_mount when tempdevfs is implemented -> just call /dev/ with all devices in devtempfs
       std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto controller) {
-        std::ranges::for_each(controller->all_devices(), [&](auto device) { active_vfs->make_device_node(device); });
+        std::ranges::for_each(controller->all_devices(), [&](auto device) { make_device_node(device); });
       });
     }
     else
-- 
cgit v1.2.3


From fbb4eefce7bf825b0406f6fa63de318153a3b95a Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Mon, 23 Mar 2026 21:41:37 +0100
Subject: Implement resolve_path

---
 kernel/src/filesystem/vfs.cpp | 46 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index ece3080..0e8a76d 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -15,6 +15,7 @@
 
 #include <algorithm>
 #include <optional>
+#include <ranges>
 #include <string_view>
 
 namespace filesystem
@@ -42,7 +43,6 @@ namespace filesystem
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
       m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
-
       m_root_fs->mount(boot_device);
 
       m_root_dentry = kstd::make_shared<dentry>(nullptr, m_root_fs->root_inode());
@@ -131,7 +131,7 @@ namespace filesystem
     m_device_nodes.push_back(device_node_entry{device->name().view(), kstd::make_shared<device_inode>(device)});
   }
 
-  auto vfs::resolve_path(std::string_view path) -> std::optional<dentry>
+  auto vfs::resolve_path(std::string_view path) -> kstd::shared_ptr<dentry>
   {
     // TODO BA-FS26 implement real path resolution with mounts and directories etc.
     // For now, just support device nodes at /dev/<device_name>.
@@ -148,13 +148,49 @@ namespace filesystem
 
       if (entry != m_device_nodes.end())
       {
-        return dentry{nullptr, entry->value().node};
+        return kstd::make_shared<dentry>(nullptr, entry->value().node);
       }
 
-      return std::nullopt;
+      return nullptr;
     }
+    else if (!path.empty() && path.front() == '/')
+    {
+      auto path_parts =
+          std::views::split(path, '/') | std::views::filter([](auto const & part) { return !part.empty(); });
+      auto parent = m_root_dentry;
 
-    return std::nullopt;
+      for (auto const & part : path_parts)
+      {
+        if (auto child = parent->find_child(std::string_view{part}))
+        {
+          parent = child;
+        }
+        else if (auto found_inode = m_root_fs->lookup(parent->get_inode(), std::string_view{part}))
+        {
+          auto next_dentry = kstd::make_shared<dentry>(parent, found_inode, std::string_view{part});
+          parent->add_child(next_dentry);
+          parent = next_dentry;
+        }
+        else
+        {
+          return nullptr;
+        }
+      }
+      // | std::views::transform([this](auto const & part) {
+      //     // TODO BA-FS26 implement real path resolution with mounts and directories etc.
+      //     // For now, just return null for any non-device-node path.
+      //     return std::optional<kstd::shared_ptr<dentry>>{};
+      //   })
+      // | std::views::filter([](auto const & opt) { return opt.has_value(); })
+      // | std::views::transform([](auto const & opt) { return opt.value(); })
+      // | std::ranges::find_if(m_mount_table, [&](auto const & mount) {
+      //     // TODO BA-FS26 implement real path resolution with mounts and directories etc.
+      //     // For now, just check if the first path component matches a mount point.
+      //     return part == mount.path();
+      //   });
+    }
+
+    return nullptr;
   }
 
 }  // namespace filesystem
\ No newline at end of file
-- 
cgit v1.2.3


From a2ac8770937a28d0d4c674e25c9b3c77802a5c9e Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Tue, 24 Mar 2026 17:22:55 +0100
Subject: Refactor mounting of new filesystems and path resolving in vfs

---
 kernel/src/filesystem/vfs.cpp | 53 ++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 0e8a76d..c77736a 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -82,9 +82,9 @@ namespace filesystem
     return nullptr;
   }
 
-  auto vfs::do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & filesystem) -> int
+  auto vfs::do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & new_filesystem) -> int
   {
-    if (!filesystem)
+    if (!new_filesystem)
     {
       return -1;  // TODO BA-FS26 panic or errorcode?
     }
@@ -100,24 +100,21 @@ namespace filesystem
       return -1;  // TODO BA-FS26 panic or errorcode?
     }
 
-    // if (path == "/")
-    // {
-    //   m_root_fs = filesystem;
-    //   m_root_mount = mount{"/", filesystem};
-    //   return 0;
-    // }
+    auto mount_dentry = resolve_path(path);
 
-    auto existing_mount =
-        std::ranges::find_if(m_mount_table, [&](auto const & existing) { return existing.path() == path; });
-    if (existing_mount != m_mount_table.end())
+    if (!mount_dentry)
     {
-      *existing_mount = mount{path, filesystem};
-    }
-    else
-    {
-      m_mount_table.push_back(mount{path, filesystem});
+      return -1;  // mount point path doesn't exist
     }
 
+    // TODO BA-FS26 check if mount point is already mounted and handle it (unmount old fs, fail, etc.)
+
+    mount_dentry->set_flag(dentry::dentry_flags::dcache_mounted);
+    m_mount_table.add_mount(kstd::make_shared<mount>(mount_dentry, new_filesystem));
+
+    new_filesystem->set_root_dentry(
+        kstd::make_shared<dentry>(mount_dentry->get_parent(), new_filesystem->root_inode()));
+
     return 0;
   }
 
@@ -157,19 +154,29 @@ namespace filesystem
     {
       auto path_parts =
           std::views::split(path, '/') | std::views::filter([](auto const & part) { return !part.empty(); });
-      auto parent = m_root_dentry;
+      auto current_parent = m_root_dentry;
+      auto current_fs = m_root_fs;
 
       for (auto const & part : path_parts)
       {
-        if (auto child = parent->find_child(std::string_view{part}))
+        if (auto child = current_parent->find_child(std::string_view{part}))
         {
-          parent = child;
+          if (child->has_flag(dentry::dentry_flags::dcache_mounted))  // found dentry is a mounted fs
+          {
+            auto found_mount = m_mount_table.find_mount_by_dentry(child);
+            current_fs = found_mount->get_filesystem();
+            current_parent = current_fs->root_dentry();
+          }
+          else
+          {  // found dentry is NOT a mounted fs -> continue path resolution in current fs
+            current_parent = child;
+          }
         }
-        else if (auto found_inode = m_root_fs->lookup(parent->get_inode(), std::string_view{part}))
+        else if (auto found_inode = m_root_fs->lookup(current_parent->get_inode(), std::string_view{part}))
         {
-          auto next_dentry = kstd::make_shared<dentry>(parent, found_inode, std::string_view{part});
-          parent->add_child(next_dentry);
-          parent = next_dentry;
+          auto next_dentry = kstd::make_shared<dentry>(current_parent, found_inode, std::string_view{part});
+          current_parent->add_child(next_dentry);
+          current_parent = next_dentry;
         }
         else
         {
-- 
cgit v1.2.3


From 7351349f296f100f10db62b5a834a971fbe51473 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Tue, 24 Mar 2026 18:52:41 +0100
Subject: small refactoring

---
 kernel/src/filesystem/vfs.cpp | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index c77736a..78dec77 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -39,7 +39,6 @@ namespace filesystem
   auto vfs::init_internal() -> void
   {
     auto storage_mgmt = devices::storage::storage_management::get();
-    // TODO BA-FS26 fix mounting boot_device
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
       m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
@@ -82,9 +81,9 @@ namespace filesystem
     return nullptr;
   }
 
-  auto vfs::do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & new_filesystem) -> int
+  auto vfs::do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & filesystem) -> int
   {
-    if (!new_filesystem)
+    if (!filesystem)
     {
       return -1;  // TODO BA-FS26 panic or errorcode?
     }
@@ -100,22 +99,19 @@ namespace filesystem
       return -1;  // TODO BA-FS26 panic or errorcode?
     }
 
-    auto mount_dentry = resolve_path(path);
-
-    if (!mount_dentry)
+    if (auto mount_dentry = resolve_path(path))
     {
-      return -1;  // mount point path doesn't exist
-    }
+      // TODO BA-FS26 check if mount point is already mounted and handle it (unmount old fs, fail, etc.)
 
-    // TODO BA-FS26 check if mount point is already mounted and handle it (unmount old fs, fail, etc.)
+      mount_dentry->set_flag(dentry::dentry_flags::dcache_mounted);
+      m_mount_table.add_mount(kstd::make_shared<mount>(mount_dentry, filesystem));
 
-    mount_dentry->set_flag(dentry::dentry_flags::dcache_mounted);
-    m_mount_table.add_mount(kstd::make_shared<mount>(mount_dentry, new_filesystem));
+      filesystem->set_root_dentry(kstd::make_shared<dentry>(mount_dentry->get_parent(), filesystem->root_inode()));
 
-    new_filesystem->set_root_dentry(
-        kstd::make_shared<dentry>(mount_dentry->get_parent(), new_filesystem->root_inode()));
+      return 0;
+    }
 
-    return 0;
+    return -1;
   }
 
   auto vfs::make_device_node(kstd::shared_ptr<devices::device> const & device) -> void
@@ -183,18 +179,6 @@ namespace filesystem
           return nullptr;
         }
       }
-      // | std::views::transform([this](auto const & part) {
-      //     // TODO BA-FS26 implement real path resolution with mounts and directories etc.
-      //     // For now, just return null for any non-device-node path.
-      //     return std::optional<kstd::shared_ptr<dentry>>{};
-      //   })
-      // | std::views::filter([](auto const & opt) { return opt.has_value(); })
-      // | std::views::transform([](auto const & opt) { return opt.value(); })
-      // | std::ranges::find_if(m_mount_table, [&](auto const & mount) {
-      //     // TODO BA-FS26 implement real path resolution with mounts and directories etc.
-      //     // For now, just check if the first path component matches a mount point.
-      //     return part == mount.path();
-      //   });
     }
 
     return nullptr;
-- 
cgit v1.2.3


From 76de81de1e12694bf6bec1edd3e3409092a92d09 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Tue, 24 Mar 2026 20:41:32 +0100
Subject: refactoring, add root_mount into the root_table

---
 kernel/src/filesystem/vfs.cpp | 53 +++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 78dec77..c8e5bc5 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -41,14 +41,13 @@ namespace filesystem
     auto storage_mgmt = devices::storage::storage_management::get();
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
-      m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
-      m_root_fs->mount(boot_device);
+      auto root_fs = kstd::make_shared<ext2::ext2_filesystem>();
+      root_fs->mount(boot_device);
 
-      m_root_dentry = kstd::make_shared<dentry>(nullptr, m_root_fs->root_inode());
-      // if (do_mount("/", m_root_fs) != 0)
-      // {
-      //   kapi::system::panic("[FILESYSTEM] Failed to mount root filesystem.");
-      // }
+      auto root_dentry = kstd::make_shared<dentry>(nullptr, root_fs->root_inode(), "/");
+      root_fs->set_root_dentry(root_dentry);
+
+      m_mount_table.add_mount(kstd::make_shared<mount>(nullptr, root_fs));
 
       // TODO BA-FS26 use do_mount when tempdevfs is implemented -> just call /dev/ with all devices in devtempfs
       std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto controller) {
@@ -148,37 +147,47 @@ namespace filesystem
     }
     else if (!path.empty() && path.front() == '/')
     {
+      auto root_mount = m_mount_table.get_root_mount();
+      if (!root_mount)
+      {
+        kapi::system::panic("[FILESYSTEM] no root mount found.");
+      }
+
+      auto current_dentry = root_mount->get_dentry();
+      auto current_fs = root_mount->get_filesystem();
+
       auto path_parts =
           std::views::split(path, '/') | std::views::filter([](auto const & part) { return !part.empty(); });
-      auto current_parent = m_root_dentry;
-      auto current_fs = m_root_fs;
-
       for (auto const & part : path_parts)
       {
-        if (auto child = current_parent->find_child(std::string_view{part}))
+        auto next_dentry = current_dentry->find_child(std::string_view{part});
+
+        if (!next_dentry)
         {
-          if (child->has_flag(dentry::dentry_flags::dcache_mounted))  // found dentry is a mounted fs
+          if (auto found_inode = current_fs->lookup(current_dentry->get_inode(), std::string_view{part}))
           {
-            auto found_mount = m_mount_table.find_mount_by_dentry(child);
-            current_fs = found_mount->get_filesystem();
-            current_parent = current_fs->root_dentry();
+            next_dentry = kstd::make_shared<dentry>(current_dentry, found_inode, std::string_view{part});
+            current_dentry->add_child(next_dentry);
           }
           else
-          {  // found dentry is NOT a mounted fs -> continue path resolution in current fs
-            current_parent = child;
+          {
+            return nullptr;
           }
         }
-        else if (auto found_inode = m_root_fs->lookup(current_parent->get_inode(), std::string_view{part}))
+
+        if (next_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
         {
-          auto next_dentry = kstd::make_shared<dentry>(current_parent, found_inode, std::string_view{part});
-          current_parent->add_child(next_dentry);
-          current_parent = next_dentry;
+          auto found_mount = m_mount_table.find_mount_by_dentry(next_dentry);
+          current_fs = found_mount->get_filesystem();
+          current_dentry = current_fs->root_dentry();
         }
         else
         {
-          return nullptr;
+          current_dentry = next_dentry;
         }
       }
+
+      return current_dentry;
     }
 
     return nullptr;
-- 
cgit v1.2.3


From 84d4476650b31dbfc52becf2ff65ddce9d31c9ec Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Tue, 24 Mar 2026 23:54:28 +0100
Subject: implement a rootfs to handle / mounts correctly

---
 kernel/src/filesystem/vfs.cpp | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index c8e5bc5..1c4dd8b 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -10,6 +10,7 @@
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/mount.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
+#include "kernel/filesystem/rootfs/rootfs_filesystem.hpp"
 
 #include <kstd/memory>
 
@@ -38,16 +39,20 @@ namespace filesystem
 
   auto vfs::init_internal() -> void
   {
+    auto virtual_fs = kstd::make_shared<rootfs::rootfs_filesystem>();
+    virtual_fs->mount(nullptr);
+
+    auto virtual_root_dentry = kstd::make_shared<dentry>(nullptr, virtual_fs->root_inode(), "/");
+    m_mount_table.add_mount(kstd::make_shared<mount>(nullptr, virtual_root_dentry, virtual_fs));
+
     auto storage_mgmt = devices::storage::storage_management::get();
     if (auto boot_device = storage_mgmt.determine_boot_device())
     {
-      auto root_fs = kstd::make_shared<ext2::ext2_filesystem>();
-      root_fs->mount(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>();
+      boot_root_fs->mount(boot_device);
 
-      auto root_dentry = kstd::make_shared<dentry>(nullptr, root_fs->root_inode(), "/");
-      root_fs->set_root_dentry(root_dentry);
-
-      m_mount_table.add_mount(kstd::make_shared<mount>(nullptr, root_fs));
+      do_mount("/", boot_root_fs);
 
       // TODO BA-FS26 use do_mount when tempdevfs is implemented -> just call /dev/ with all devices in devtempfs
       std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto controller) {
@@ -102,10 +107,10 @@ namespace filesystem
     {
       // TODO BA-FS26 check if mount point is already mounted and handle it (unmount old fs, fail, etc.)
 
+      auto new_fs_root = kstd::make_shared<dentry>(mount_dentry, filesystem->root_inode());
+      auto new_mount = kstd::make_shared<mount>(mount_dentry, new_fs_root, filesystem);
+      m_mount_table.add_mount(new_mount);
       mount_dentry->set_flag(dentry::dentry_flags::dcache_mounted);
-      m_mount_table.add_mount(kstd::make_shared<mount>(mount_dentry, filesystem));
-
-      filesystem->set_root_dentry(kstd::make_shared<dentry>(mount_dentry->get_parent(), filesystem->root_inode()));
 
       return 0;
     }
@@ -153,20 +158,30 @@ namespace filesystem
         kapi::system::panic("[FILESYSTEM] no root mount found.");
       }
 
-      auto current_dentry = root_mount->get_dentry();
+      auto current_dentry = root_mount->root_dentry();
       auto current_fs = root_mount->get_filesystem();
 
+      while (current_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
+      {
+        auto mnt = m_mount_table.find_mount_by_dentry(current_dentry);
+        if (!mnt)
+          kapi::system::panic("[FILESYSTEM] dcache_mounted set but no covering mount found.");
+        current_dentry = mnt->root_dentry();
+        current_fs = mnt->get_filesystem();
+      }
+
       auto path_parts =
           std::views::split(path, '/') | std::views::filter([](auto const & part) { return !part.empty(); });
       for (auto const & part : path_parts)
       {
-        auto next_dentry = current_dentry->find_child(std::string_view{part});
+        std::string_view part_view{part};
+        auto next_dentry = current_dentry->find_child(part_view);
 
         if (!next_dentry)
         {
-          if (auto found_inode = current_fs->lookup(current_dentry->get_inode(), std::string_view{part}))
+          if (auto found_inode = current_fs->lookup(current_dentry->get_inode(), part_view))
           {
-            next_dentry = kstd::make_shared<dentry>(current_dentry, found_inode, std::string_view{part});
+            next_dentry = kstd::make_shared<dentry>(current_dentry, found_inode, part_view);
             current_dentry->add_child(next_dentry);
           }
           else
@@ -179,7 +194,7 @@ namespace filesystem
         {
           auto found_mount = m_mount_table.find_mount_by_dentry(next_dentry);
           current_fs = found_mount->get_filesystem();
-          current_dentry = current_fs->root_dentry();
+          current_dentry = found_mount->root_dentry();
         }
         else
         {
-- 
cgit v1.2.3


From 74351bbcd440189bafa79c806dd3ae8255f42c11 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Wed, 25 Mar 2026 07:47:24 +0100
Subject: currently do not support stacked mounts

---
 kernel/src/filesystem/vfs.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 1c4dd8b..483bae5 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -161,7 +161,8 @@ namespace filesystem
       auto current_dentry = root_mount->root_dentry();
       auto current_fs = root_mount->get_filesystem();
 
-      while (current_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
+      // TODO BA-FS26 use while to allow stacked mounts?
+      if (current_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
       {
         auto mnt = m_mount_table.find_mount_by_dentry(current_dentry);
         if (!mnt)
@@ -190,6 +191,7 @@ namespace filesystem
           }
         }
 
+        // TODO BA-FS26 use while to allow stacked mounts?
         if (next_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
         {
           auto found_mount = m_mount_table.find_mount_by_dentry(next_dentry);
-- 
cgit v1.2.3


From 31ac3e6ffff00b7ac3b3dbb3db38c44409251b34 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Thu, 26 Mar 2026 20:09:37 +0100
Subject: first draft of an devfs implementation

---
 kernel/src/filesystem/vfs.cpp | 50 ++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 483bae5..368d994 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -2,10 +2,9 @@
 
 #include "kapi/system.hpp"
 
-#include "kernel/devices/device.hpp"
 #include "kernel/devices/storage/storage_management.hpp"
 #include "kernel/filesystem/dentry.hpp"
-#include "kernel/filesystem/device_inode.hpp"
+#include "kernel/filesystem/devfs/devfs_filesystem.hpp"
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
 #include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/mount.hpp"
@@ -14,7 +13,6 @@
 
 #include <kstd/memory>
 
-#include <algorithm>
 #include <optional>
 #include <ranges>
 #include <string_view>
@@ -52,12 +50,18 @@ namespace filesystem
       auto boot_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
       boot_root_fs->mount(boot_device);
 
-      do_mount("/", boot_root_fs);
+      if (do_mount("/", boot_root_fs) != 0)
+      {
+        kapi::system::panic("[FILESYSTEM] failed to mount root filesystem.");
+      }
+
+      auto device_fs = kstd::make_shared<devfs::devfs_filesystem>();
+      device_fs->mount(nullptr);
 
-      // TODO BA-FS26 use do_mount when tempdevfs is implemented -> just call /dev/ with all devices in devtempfs
-      std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto controller) {
-        std::ranges::for_each(controller->all_devices(), [&](auto device) { make_device_node(device); });
-      });
+      if (do_mount("/dev", device_fs) != 0)
+      {
+        kapi::system::panic("[FILESYSTEM] failed to mount devfs at /dev.");
+      }
     }
     else
     {
@@ -118,39 +122,13 @@ namespace filesystem
     return -1;
   }
 
-  auto vfs::make_device_node(kstd::shared_ptr<devices::device> const & device) -> void
-  {
-    if (!device)
-    {
-      kapi::system::panic("[FILESYSTEM] make_device_node called with null device.");
-    }
-
-    m_device_nodes.push_back(device_node_entry{device->name().view(), kstd::make_shared<device_inode>(device)});
-  }
-
   auto vfs::resolve_path(std::string_view path) -> kstd::shared_ptr<dentry>
   {
-    // TODO BA-FS26 implement real path resolution with mounts and directories etc.
-    // For now, just support device nodes at /dev/<device_name>.
+    // TODO BA-FS26 implement full path resolution semantics.
     // TODO BA-FS26 better path validation
     // TODO BA-FS26 implement a path parser (maybe in libs?) and use it here and in do_mount
 
-    constexpr auto device_prefix = std::string_view{"/dev/"};
-    if (path.starts_with(device_prefix))
-    {
-      auto const device_name = path.substr(device_prefix.size());
-      auto entry = std::ranges::find_if(m_device_nodes, [&](auto const & device_entry) {
-        return device_entry.has_value() && device_entry->name == device_name;
-      });
-
-      if (entry != m_device_nodes.end())
-      {
-        return kstd::make_shared<dentry>(nullptr, entry->value().node);
-      }
-
-      return nullptr;
-    }
-    else if (!path.empty() && path.front() == '/')
+    if (!path.empty() && path.front() == '/')
     {
       auto root_mount = m_mount_table.get_root_mount();
       if (!root_mount)
-- 
cgit v1.2.3


From c3e80174faa2db9e6674af995aaa95b59ec53fec Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Thu, 26 Mar 2026 21:15:40 +0100
Subject: fix resolve_path -> first traverse rootfs before jumping into the
 mounted root filesystem

---
 kernel/src/filesystem/vfs.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 368d994..40c97f8 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -139,16 +139,6 @@ namespace filesystem
       auto current_dentry = root_mount->root_dentry();
       auto current_fs = root_mount->get_filesystem();
 
-      // TODO BA-FS26 use while to allow stacked mounts?
-      if (current_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
-      {
-        auto mnt = m_mount_table.find_mount_by_dentry(current_dentry);
-        if (!mnt)
-          kapi::system::panic("[FILESYSTEM] dcache_mounted set but no covering mount found.");
-        current_dentry = mnt->root_dentry();
-        current_fs = mnt->get_filesystem();
-      }
-
       auto path_parts =
           std::views::split(path, '/') | std::views::filter([](auto const & part) { return !part.empty(); });
       for (auto const & part : path_parts)
@@ -173,6 +163,8 @@ namespace filesystem
         if (next_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
         {
           auto found_mount = m_mount_table.find_mount_by_dentry(next_dentry);
+          if (!found_mount)
+            kapi::system::panic("[FILESYSTEM] dcache_mounted set but no covering mount found.");
           current_fs = found_mount->get_filesystem();
           current_dentry = found_mount->root_dentry();
         }
-- 
cgit v1.2.3


From a6f93bf8df0dbfa7d19aa1168bfc8b052e41c42f Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sat, 28 Mar 2026 17:28:32 +0100
Subject: fix vfs mount with /dev & /a  and rootfs & devfs

---
 kernel/src/filesystem/vfs.cpp | 122 ++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 71 deletions(-)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 40c97f8..da7fa05 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -37,11 +37,11 @@ namespace filesystem
 
   auto vfs::init_internal() -> void
   {
-    auto virtual_fs = kstd::make_shared<rootfs::rootfs_filesystem>();
-    virtual_fs->mount(nullptr);
+    auto root_fs = kstd::make_shared<rootfs::rootfs_filesystem>();
+    root_fs->mount(nullptr);
 
-    auto virtual_root_dentry = kstd::make_shared<dentry>(nullptr, virtual_fs->root_inode(), "/");
-    m_mount_table.add_mount(kstd::make_shared<mount>(nullptr, virtual_root_dentry, virtual_fs));
+    auto root_fs_root_dentry = kstd::make_shared<dentry>(nullptr, root_fs->root_inode());
+    m_mount_table.add_mount(kstd::make_shared<mount>(nullptr, root_fs_root_dentry, root_fs, ""));
 
     auto storage_mgmt = devices::storage::storage_management::get();
     if (auto boot_device = storage_mgmt.determine_boot_device())
@@ -49,24 +49,12 @@ namespace filesystem
       // 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>();
       boot_root_fs->mount(boot_device);
-
-      if (do_mount("/", boot_root_fs) != 0)
-      {
-        kapi::system::panic("[FILESYSTEM] failed to mount root filesystem.");
-      }
-
-      auto device_fs = kstd::make_shared<devfs::devfs_filesystem>();
-      device_fs->mount(nullptr);
-
-      if (do_mount("/dev", device_fs) != 0)
-      {
-        kapi::system::panic("[FILESYSTEM] failed to mount devfs at /dev.");
-      }
-    }
-    else
-    {
-      // TODO BA-FS26 ?? what when no boot_device == no modules loaded??
+      do_mount_internal("/", root_fs_root_dentry, boot_root_fs);
     }
+
+    auto device_fs = kstd::make_shared<devfs::devfs_filesystem>();
+    device_fs->mount(nullptr);
+    do_mount_internal("/dev", root_fs_root_dentry, device_fs);
   }
 
   auto vfs::get() -> vfs &
@@ -107,77 +95,69 @@ namespace filesystem
       return -1;  // TODO BA-FS26 panic or errorcode?
     }
 
-    if (auto mount_dentry = resolve_path(path))
+    if (auto mount_point_dentry = resolve_path(path))
     {
-      // TODO BA-FS26 check if mount point is already mounted and handle it (unmount old fs, fail, etc.)
-
-      auto new_fs_root = kstd::make_shared<dentry>(mount_dentry, filesystem->root_inode());
-      auto new_mount = kstd::make_shared<mount>(mount_dentry, new_fs_root, filesystem);
-      m_mount_table.add_mount(new_mount);
-      mount_dentry->set_flag(dentry::dentry_flags::dcache_mounted);
-
+      do_mount_internal(path, mount_point_dentry, filesystem);
       return 0;
     }
 
     return -1;
   }
 
+  auto vfs::do_mount_internal(std::string_view path, kstd::shared_ptr<dentry> const & mount_point_dentry,
+                              kstd::shared_ptr<filesystem> const & fs) -> void
+  {
+    // TODO BA-FS26 check if mount point is already mounted and handle it (unmount old fs, fail, etc.)
+    auto new_fs_root = kstd::make_shared<dentry>(mount_point_dentry, fs->root_inode());
+    auto new_mount = kstd::make_shared<mount>(mount_point_dentry, new_fs_root, fs, path);
+    m_mount_table.add_mount(new_mount);
+  }
+
   auto vfs::resolve_path(std::string_view path) -> kstd::shared_ptr<dentry>
   {
     // TODO BA-FS26 implement full path resolution semantics.
     // TODO BA-FS26 better path validation
     // TODO BA-FS26 implement a path parser (maybe in libs?) and use it here and in do_mount
 
-    if (!path.empty() && path.front() == '/')
+    if (path.empty() || path.front() != '/')
+      return nullptr;
+
+    // TODO BA-FS26 longest match in mount_table -> jump into final fs directly
+    // TODO BA-FS26 performance optimization first check mounted_flag O(1) then check mount_table O(n)
+
+    auto best_mount = m_mount_table.find_longest_prefix_mount(path);
+    if (!best_mount)
     {
-      auto root_mount = m_mount_table.get_root_mount();
-      if (!root_mount)
-      {
-        kapi::system::panic("[FILESYSTEM] no root mount found.");
-      }
+      kapi::system::panic("[FILESYSTEM] no root mount found.");
+    }
 
-      auto current_dentry = root_mount->root_dentry();
-      auto current_fs = root_mount->get_filesystem();
+    auto current_dentry = best_mount->root_dentry();
+    auto current_fs = best_mount->get_filesystem();
 
-      auto path_parts =
-          std::views::split(path, '/') | std::views::filter([](auto const & part) { return !part.empty(); });
-      for (auto const & part : path_parts)
+    std::string_view remaining = path.substr(best_mount->get_mount_path().size());
+
+    auto path_parts =
+        std::views::split(remaining, '/') | std::views::filter([](auto const & part) { return !part.empty(); });
+
+    for (auto const & part : path_parts)
+    {
+      std::string_view part_view{part};
+
+      auto next_dentry = current_dentry->find_child(part_view);
+      if (!next_dentry)
       {
-        std::string_view part_view{part};
-        auto next_dentry = current_dentry->find_child(part_view);
-
-        if (!next_dentry)
-        {
-          if (auto found_inode = current_fs->lookup(current_dentry->get_inode(), part_view))
-          {
-            next_dentry = kstd::make_shared<dentry>(current_dentry, found_inode, part_view);
-            current_dentry->add_child(next_dentry);
-          }
-          else
-          {
-            return nullptr;
-          }
-        }
-
-        // TODO BA-FS26 use while to allow stacked mounts?
-        if (next_dentry->has_flag(dentry::dentry_flags::dcache_mounted))
-        {
-          auto found_mount = m_mount_table.find_mount_by_dentry(next_dentry);
-          if (!found_mount)
-            kapi::system::panic("[FILESYSTEM] dcache_mounted set but no covering mount found.");
-          current_fs = found_mount->get_filesystem();
-          current_dentry = found_mount->root_dentry();
-        }
-        else
-        {
-          current_dentry = next_dentry;
-        }
+        auto found_inode = current_fs->lookup(current_dentry->get_inode(), part_view);
+        if (!found_inode)
+          return nullptr;
+
+        next_dentry = kstd::make_shared<dentry>(current_dentry, found_inode, part_view);
+        current_dentry->add_child(next_dentry);
       }
 
-      return current_dentry;
+      current_dentry = next_dentry;
     }
 
-    return nullptr;
+    return current_dentry;
   }
 
 }  // namespace filesystem
\ No newline at end of file
-- 
cgit v1.2.3


From fe964c2c9d3fb29223060f99c07ae1ce4e69daae Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sat, 28 Mar 2026 19:14:02 +0100
Subject: set flag (currently not needed)

---
 kernel/src/filesystem/vfs.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'kernel/src/filesystem/vfs.cpp')

diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index da7fa05..7a90531 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -111,6 +111,7 @@ namespace filesystem
     auto new_fs_root = kstd::make_shared<dentry>(mount_point_dentry, fs->root_inode());
     auto new_mount = kstd::make_shared<mount>(mount_point_dentry, new_fs_root, fs, path);
     m_mount_table.add_mount(new_mount);
+    mount_point_dentry->set_flag(dentry::dentry_flags::dcache_mounted);
   }
 
   auto vfs::resolve_path(std::string_view path) -> kstd::shared_ptr<dentry>
-- 
cgit v1.2.3