RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 14:55:08 +00:00
Code Issues Activity Actions

Kernel: Change Inode::{read/write}_bytes interface to KResultOr<ssize_t>

Browse source 
The error handling in all these cases was still using the old style
negative values to indicate errors. We have a nicer solution for this
now with KResultOr<T>. This change switches the interface and then all
implementers to use the new style.
This commit is contained in:
Brian Gianforcaro 2021-05-01 14:29:39 -07:00 • committed by Andreas Kling
parent de9b454f89
commit 234c6ae32d
18 changed files with 88 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Kernel/FileSystem/InodeFile.cpp
View file

@ -31,13 +31,14 @@ KResultOr<size_t> InodeFile::read(FileDescription& description, u64 offset, User
if (Checked<off_t>::addition_would_overflow(offset, count))
return EOVERFLOW;
ssize_t nread = m_inode->read_bytes(offset, count, buffer, &description);
auto result = m_inode->read_bytes(offset, count, buffer, &description);
if (result.is_error())
return result.error();
auto nread = result.value();
if (nread > 0) {
Thread::current()->did_file_read(nread);
evaluate_block_conditions();
}
if (nread < 0)
return KResult((ErrnoCode)-nread);
return nread;
}
@ -46,7 +47,11 @@ KResultOr<size_t> InodeFile::write(FileDescription& description, u64 offset, con
if (Checked<off_t>::addition_would_overflow(offset, count))
return EOVERFLOW;
ssize_t nwritten = m_inode->write_bytes(offset, count, data, &description);
auto result = m_inode->write_bytes(offset, count, data, &description);
if (result.is_error())
return result.error();
auto nwritten = result.value();
if (nwritten > 0) {
auto mtime_result = m_inode->set_mtime(kgettimeofday().to_truncated_seconds());
Thread::current()->did_file_write(nwritten);
@ -54,8 +59,6 @@ KResultOr<size_t> InodeFile::write(FileDescription& description, u64 offset, con
if (mtime_result.is_error())
return mtime_result;
}
if (nwritten < 0)
return KResult((ErrnoCode)-nwritten);
return nwritten;
}