Merge branch 'mount-reference-count' into 'develop-BA-FS26'

Mount reference count

See merge request teachos/kernel!37

1 files changed, 57 insertions, 3 deletions

diff --git a/kernel/src/filesystem/vfs.tests.cpp b/kernel/src/filesystem/vfs.tests.cpp
index 0f1d6d5..648ebb8 100644
--- a/kernel/src/filesystem/vfs.tests.cpp
+++ b/kernel/src/filesystem/vfs.tests.cpp
@@ -105,6 +105,8 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
 
       auto mounted_monkey_1 = vfs.open("/information/monkey_house/monkey_1.txt");
       REQUIRE(mounted_monkey_1 != nullptr);
+      REQUIRE(vfs.close(mounted_monkey_1->get_absolute_path().view()) ==
+              kernel::filesystem::vfs::operation_result::success);
 
       REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::success);
       auto unmounted_monkey_1 = vfs.open("/information/monkey_house/monkey_1.txt");
@@ -126,12 +128,47 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       REQUIRE(mounted_monkey_1 != nullptr);
       REQUIRE(mounted_fish1 != nullptr);
 
+      REQUIRE(vfs.close(mounted_monkey_1->get_absolute_path().view()) ==
+              kernel::filesystem::vfs::operation_result::success);
+      REQUIRE(vfs.close(mounted_fish1->get_absolute_path().view()) ==
+              kernel::filesystem::vfs::operation_result::success);
+
       REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::unmount_failed);
       REQUIRE(vfs.unmount("/information/monkey_house/infrastructure") ==
               kernel::filesystem::vfs::operation_result::success);
       REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::success);
     }
 
+    THEN("image can be mounted, unmount only if no files are open")
+    {
+      REQUIRE(vfs.do_mount("/dev/ram16", "/information") == kernel::filesystem::vfs::operation_result::success);
+
+      auto mounted_monkey_1 = vfs.open("/information/monkey_house/monkey_1.txt");
+      REQUIRE(mounted_monkey_1 != nullptr);
+
+      REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::unmount_failed);
+
+      REQUIRE(vfs.close(mounted_monkey_1->get_absolute_path().view()) ==
+              kernel::filesystem::vfs::operation_result::success);
+
+      REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::success);
+    }
+
+    THEN("file with invalid path or not opened file cannot be closed")
+    {
+      REQUIRE(vfs.close("invalid_path") == kernel::filesystem::vfs::operation_result::invalid_path);
+      REQUIRE(vfs.close("/information/info_1.txt") == kernel::filesystem::vfs::operation_result::close_failed);
+    }
+
+    THEN("file cannot be closed twice")
+    {
+      auto info_1 = vfs.open("/information/info_1.txt");
+      REQUIRE(info_1 != nullptr);
+
+      REQUIRE(vfs.close(info_1->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::success);
+      REQUIRE(vfs.close(info_1->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::close_failed);
+    }
+
     THEN("images can be stacked mounted and correct file system is unmounted again")
     {
       REQUIRE(vfs.do_mount("/dev/ram16", "/information") == kernel::filesystem::vfs::operation_result::success);
@@ -140,6 +177,9 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       auto mounted_tickets = vfs.open("/information/entrance/tickets.txt");
       REQUIRE(mounted_tickets != nullptr);
 
+      REQUIRE(vfs.close(mounted_tickets->get_absolute_path().view()) ==
+              kernel::filesystem::vfs::operation_result::success);
+
       REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::success);
       mounted_tickets = vfs.open("/information/entrance/tickets.txt");
       REQUIRE(mounted_tickets == nullptr);
@@ -161,6 +201,8 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       auto water = vfs.open("/monkey_house/infrastructure/water.txt");
       REQUIRE(water != nullptr);
 
+      REQUIRE(vfs.close(water->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::success);
+
       REQUIRE(vfs.unmount("/") == kernel::filesystem::vfs::operation_result::success);
 
       info_1 = vfs.open("/information/info_1.txt");
@@ -180,6 +222,8 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       auto water = vfs.open("/monkey_house/infrastructure/water.txt");
       REQUIRE(water != nullptr);
 
+      REQUIRE(vfs.close(water->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::success);
+
       auto dev_ram_16 = vfs.open("/dev/ram16");
       REQUIRE(dev_ram_16 == nullptr);
 
@@ -196,6 +240,8 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       auto info_1 = vfs.open("/information/info_1.txt");
       REQUIRE(info_1 != nullptr);
 
+      REQUIRE(vfs.close(info_1->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::success);
+
       REQUIRE(vfs.unmount("/dev") == kernel::filesystem::vfs::operation_result::success);
       REQUIRE(vfs.unmount("/") == kernel::filesystem::vfs::operation_result::success);
 
@@ -310,13 +356,15 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
 
       auto dentry = vfs.open("/information/sheep_1.txt");
       REQUIRE(dentry != nullptr);
-      auto sheep_1_ofd = kstd::make_shared<kernel::filesystem::open_file_descriptor>(dentry->get_inode());
+      auto sheep_1_ofd = kstd::make_shared<kernel::filesystem::open_file_descriptor>(dentry);
 
       kstd::vector<std::byte> buffer(7);
       auto bytes_read = sheep_1_ofd->read(buffer.data(), buffer.size());
       std::string_view buffer_as_str{reinterpret_cast<char *>(buffer.data()), bytes_read};
       REQUIRE(buffer_as_str == "sheep_1");
 
+      REQUIRE(vfs.close(dentry->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::success);
+
       REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::success);
       auto unmounted_sheep_1 = vfs.open("/information/sheep_1.txt");
       REQUIRE(unmounted_sheep_1 == nullptr);
@@ -335,8 +383,8 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       REQUIRE(sheep_1 != nullptr);
       REQUIRE(goat_1 != nullptr);
 
-      auto sheep_1_ofd = kstd::make_shared<kernel::filesystem::open_file_descriptor>(sheep_1->get_inode());
-      auto goat_1_ofd = kstd::make_shared<kernel::filesystem::open_file_descriptor>(goat_1->get_inode());
+      auto sheep_1_ofd = kstd::make_shared<kernel::filesystem::open_file_descriptor>(sheep_1);
+      auto goat_1_ofd = kstd::make_shared<kernel::filesystem::open_file_descriptor>(goat_1);
 
       kstd::vector<std::byte> sheep_buffer(7);
       auto bytes_read = sheep_1_ofd->read(sheep_buffer.data(), sheep_buffer.size());
@@ -348,6 +396,9 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       buffer_as_str = std::string_view{reinterpret_cast<char *>(goat_buffer.data()), bytes_read};
       REQUIRE(buffer_as_str == "goat_1");
 
+      REQUIRE(vfs.close(sheep_1->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::success);
+      REQUIRE(vfs.close(goat_1->get_absolute_path().view()) == kernel::filesystem::vfs::operation_result::success);
+
       REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::unmount_failed);
 
       REQUIRE(vfs.unmount("/information/stable") == kernel::filesystem::vfs::operation_result::success);
@@ -357,6 +408,9 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "VFS
       auto still_mounted_sheep_1 = vfs.open("/information/sheep_1.txt");
       REQUIRE(still_mounted_sheep_1 != nullptr);
 
+      REQUIRE(vfs.close(still_mounted_sheep_1->get_absolute_path().view()) ==
+              kernel::filesystem::vfs::operation_result::success);
+
       REQUIRE(vfs.unmount("/information") == kernel::filesystem::vfs::operation_result::success);
       auto unmounted_sheep_1 = vfs.open("/information/sheep_1.txt");
       REQUIRE(unmounted_sheep_1 == nullptr);