aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kapi/filesystem.cpp13
-rw-r--r--kernel/kernel/filesystem/ext2/filesystem.cpp2
2 files changed, 7 insertions, 8 deletions
diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index 8582d89e..5910b48d 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -17,17 +17,17 @@
namespace kapi::filesystem
{
- auto mount(std::string_view source, std::string_view target) -> std::expected<void, kstd::error_code>
+ auto mount(std::string_view source, std::string_view target) -> kstd::result<void>
{
return kernel::filesystem::vfs::get().mount(source, target);
}
- auto umount(std::string_view target) -> std::expected<void, kstd::error_code>
+ auto umount(std::string_view target) -> kstd::result<void>
{
return kernel::filesystem::vfs::get().unmount(target);
}
- auto open(std::string_view path) -> std::expected<std::size_t, kstd::error_code>
+ auto open(std::string_view path) -> kstd::result<std::size_t>
{
return kernel::filesystem::vfs::get().open(path).and_then([](auto dentry) {
auto open_file_descriptor = kstd::make_shared<kernel::filesystem::open_file_descriptor>(dentry);
@@ -35,7 +35,7 @@ namespace kapi::filesystem
});
}
- auto close(size_t file_descriptor) -> std::expected<void, kstd::error_code>
+ auto close(size_t file_descriptor) -> kstd::result<void>
{
return kernel::filesystem::open_file_table::get()
.file(file_descriptor)
@@ -44,15 +44,14 @@ namespace kapi::filesystem
.and_then([=]() { return kernel::filesystem::open_file_table::get().remove_file(file_descriptor); });
}
- auto read(size_t file_descriptor, std::span<std::byte> buffer) -> std::expected<kstd::units::bytes, kstd::error_code>
+ auto read(size_t file_descriptor, std::span<std::byte> buffer) -> kstd::result<kstd::units::bytes>
{
return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
return descriptor->read(buffer);
});
}
- auto write(size_t file_descriptor, std::span<std::byte const> buffer)
- -> std::expected<kstd::units::bytes, kstd::error_code>
+ auto write(size_t file_descriptor, std::span<std::byte const> buffer) -> kstd::result<kstd::units::bytes>
{
return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
return descriptor->write(buffer);
diff --git a/kernel/kernel/filesystem/ext2/filesystem.cpp b/kernel/kernel/filesystem/ext2/filesystem.cpp
index ff84a459..c7d8aee4 100644
--- a/kernel/kernel/filesystem/ext2/filesystem.cpp
+++ b/kernel/kernel/filesystem/ext2/filesystem.cpp
@@ -550,7 +550,7 @@ namespace kernel::filesystem::ext2
}
auto filesystem::map_inode_block_index_to_global_block_number(size_t inode_block_index, inode_data data) const
- -> std::expected<std::size_t, kstd::error_code>
+ -> kstd::result<std::size_t>
{
if (inode_block_index < constants::direct_block_count)
{