1 files changed, 20 insertions, 38 deletions

diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index 24a3adf3..f84949da 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -6,7 +6,6 @@
 
 #include <kstd/memory.hpp>
 #include <kstd/system_error.hpp>
-#include <kstd/unikstd.h>
 
 #include <cstddef>
 #include <expected>
@@ -14,62 +13,45 @@
 
 namespace kapi::filesystem
 {
-  auto mount(std::string_view source, std::string_view target) -> kstd::ssize_t
+  auto mount(std::string_view source, std::string_view target) -> std::expected<void, kstd::error_code>
   {
-    if (kernel::filesystem::vfs::get().do_mount(source, target) == kernel::filesystem::vfs::operation_result::success)
-    {
-      return 0;
-    }
-    return -1;
+    return kernel::filesystem::vfs::get().do_mount(source, target);
   }
 
-  auto umount(std::string_view target) -> kstd::ssize_t
+  auto umount(std::string_view target) -> std::expected<void, kstd::error_code>
   {
-    if (kernel::filesystem::vfs::get().unmount(target) == kernel::filesystem::vfs::operation_result::success)
-    {
-      return 0;
-    }
-    return -1;
+    return kernel::filesystem::vfs::get().unmount(target);
   }
 
   auto open(std::string_view path) -> std::expected<std::size_t, kstd::error_code>
   {
-    return kernel::filesystem::vfs::get().open(path).transform([](auto dentry) {
+    return kernel::filesystem::vfs::get().open(path).and_then([](auto dentry) {
       auto open_file_descriptor = kstd::make_shared<kernel::filesystem::open_file_descriptor>(dentry);
       return kernel::filesystem::open_file_table::get().add_file(open_file_descriptor);
     });
   }
 
-  auto close(size_t file_descriptor) -> kstd::ssize_t
+  auto close(size_t file_descriptor) -> std::expected<void, kstd::error_code>
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
-    {
-      if (kernel::filesystem::vfs::get().close(open_file_descriptor->get_dentry()->absolute_path()) ==
-          kernel::filesystem::vfs::operation_result::success)
-      {
-        return kernel::filesystem::open_file_table::get().remove_file(file_descriptor);
-      }
-    }
-    return -1;
+    return kernel::filesystem::open_file_table::get()
+        .file(file_descriptor)
+        .transform([](auto file) { return file->get_dentry()->absolute_path(); })
+        .and_then([](auto path) { return kernel::filesystem::vfs::get().close(path); })
+        .and_then([=]() { return kernel::filesystem::open_file_table::get().remove_file(file_descriptor); })
+        .transform([](auto) { return; });
   }
 
-  auto read(size_t file_descriptor, void * buffer, size_t size) -> kstd::ssize_t
+  auto read(size_t file_descriptor, void * buffer, size_t size) -> std::expected<std::size_t, kstd::error_code>
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
-    {
-      return open_file_descriptor->read(buffer, size);
-    }
-
-    return -1;
+    return kernel::filesystem::open_file_table::get().file(file_descriptor).transform([=](auto descriptor) {
+      return descriptor->read(buffer, size);
+    });
   }
 
-  auto write(size_t file_descriptor, void const * buffer, size_t size) -> kstd::ssize_t
+  auto write(size_t file_descriptor, void const * buffer, size_t size) -> std::expected<std::size_t, kstd::error_code>
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
-    {
-      return open_file_descriptor->write(buffer, size);
-    }
-
-    return -1;
+    return kernel::filesystem::open_file_table::get().file(file_descriptor).transform([=](auto descriptor) {
+      return descriptor->write(buffer, size);
+    });
   }
 }  // namespace kapi::filesystem
\ No newline at end of file