aboutsummaryrefslogtreecommitdiff
path: root/kernel/src/filesystem/rootfs
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src/filesystem/rootfs')
-rw-r--r--kernel/src/filesystem/rootfs/filesystem.cpp9
-rw-r--r--kernel/src/filesystem/rootfs/filesystem.tests.cpp7
-rw-r--r--kernel/src/filesystem/rootfs/inode.cpp14
-rw-r--r--kernel/src/filesystem/rootfs/inode.tests.cpp47
4 files changed, 2 insertions, 75 deletions
diff --git a/kernel/src/filesystem/rootfs/filesystem.cpp b/kernel/src/filesystem/rootfs/filesystem.cpp
index 6187c3c..d49e237 100644
--- a/kernel/src/filesystem/rootfs/filesystem.cpp
+++ b/kernel/src/filesystem/rootfs/filesystem.cpp
@@ -11,18 +11,13 @@ namespace kernel::filesystem::rootfs
{
auto filesystem::mount(kstd::shared_ptr<kernel::filesystem::inode> const &) -> operation_result
{
- auto rfs_inode = kstd::make_shared<inode>();
- rfs_inode->add_child("dev");
- m_root_inode = rfs_inode;
-
+ m_root_inode = kstd::make_shared<inode>();
return operation_result::success;
}
- auto filesystem::lookup(kstd::shared_ptr<kernel::filesystem::inode> const & parent, std::string_view name)
+ auto filesystem::lookup(kstd::shared_ptr<kernel::filesystem::inode> const &, std::string_view)
-> kstd::shared_ptr<kernel::filesystem::inode>
{
- if (auto * rfs_inode = static_cast<inode *>(parent.get()))
- return rfs_inode->lookup_child(name);
return nullptr;
}
} // namespace kernel::filesystem::rootfs
diff --git a/kernel/src/filesystem/rootfs/filesystem.tests.cpp b/kernel/src/filesystem/rootfs/filesystem.tests.cpp
index 81ac9e4..ae320e9 100644
--- a/kernel/src/filesystem/rootfs/filesystem.tests.cpp
+++ b/kernel/src/filesystem/rootfs/filesystem.tests.cpp
@@ -21,13 +21,6 @@ SCENARIO("Rootfs filesystem mount and lookup", "[filesystem][rootfs][filesystem]
REQUIRE(fs.root_inode() != nullptr);
}
- THEN("looking up the 'dev' directory returns a valid inode")
- {
- auto dev_inode = fs.lookup(fs.root_inode(), "dev");
- REQUIRE(dev_inode != nullptr);
- REQUIRE(dev_inode->is_directory());
- }
-
THEN("looking up a non-existent directory returns null")
{
auto non_existent_inode_1 = fs.lookup(fs.root_inode(), "");
diff --git a/kernel/src/filesystem/rootfs/inode.cpp b/kernel/src/filesystem/rootfs/inode.cpp
index d099676..dbe7948 100644
--- a/kernel/src/filesystem/rootfs/inode.cpp
+++ b/kernel/src/filesystem/rootfs/inode.cpp
@@ -5,10 +5,7 @@
#include <kstd/memory>
#include <kstd/string>
-#include <algorithm>
#include <cstddef>
-#include <string_view>
-#include <utility>
namespace kernel::filesystem::rootfs
{
@@ -22,17 +19,6 @@ namespace kernel::filesystem::rootfs
return 0;
}
- auto inode::add_child(std::string_view name) -> void
- {
- m_children.push_back(std::make_pair(kstd::string{name}, kstd::make_shared<inode>()));
- }
-
- auto inode::lookup_child(std::string_view name) -> kstd::shared_ptr<inode>
- {
- auto it = std::ranges::find_if(m_children, [&](auto const & pair) { return pair.first == name; });
- return (it != m_children.end()) ? it->second : nullptr;
- }
-
auto inode::is_directory() const -> bool
{
return true;
diff --git a/kernel/src/filesystem/rootfs/inode.tests.cpp b/kernel/src/filesystem/rootfs/inode.tests.cpp
index 7cc217f..f4b634f 100644
--- a/kernel/src/filesystem/rootfs/inode.tests.cpp
+++ b/kernel/src/filesystem/rootfs/inode.tests.cpp
@@ -6,53 +6,6 @@
#include <catch2/catch_test_macros.hpp>
-SCENARIO("Rootfs inode creation", "[filesystem][rootfs][inode]")
-{
- GIVEN("a rootfs inode")
- {
- auto inode = kernel::filesystem::rootfs::inode{};
-
- THEN("the inode has the correct kind")
- {
- REQUIRE(inode.is_directory());
- REQUIRE_FALSE(inode.is_device());
- REQUIRE_FALSE(inode.is_regular());
- REQUIRE_FALSE(inode.is_symbolic_link());
- }
-
- THEN("the inode has no children")
- {
- REQUIRE(inode.lookup_child("child") == nullptr);
- }
- }
-}
-
-SCENARIO("Rootfs inode child management", "[filesystem][rootfs][inode]")
-{
- GIVEN("a rootfs inode")
- {
- auto inode = kernel::filesystem::rootfs::inode{};
-
- WHEN("adding a child inode")
- {
- inode.add_child("child");
- inode.add_child("another child");
-
- THEN("the child can be looked up by name")
- {
- auto child_inode = inode.lookup_child("child");
- REQUIRE(child_inode != nullptr);
- REQUIRE(child_inode->is_directory());
- }
-
- THEN("looking up a non-existent child returns null")
- {
- REQUIRE(inode.lookup_child("nonexistent") == nullptr);
- }
- }
- }
-}
-
SCENARIO("Rootfs inode read/write", "[filesystem][rootfs][inode]")
{
GIVEN("a rootfs inode")