mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 07:37:35 +00:00
Kernel: Replace KResult and KResultOr<T> with Error and ErrorOr<T>
We now use AK::Error and AK::ErrorOr<T> in both kernel and userspace! This was a slightly tedious refactoring that took a long time, so it's not unlikely that some bugs crept in. Nevertheless, it does pass basic functionality testing, and it's just real nice to finally see the same pattern in all contexts. :^)
This commit is contained in:
parent
7ee10c6926
commit
79fa9765ca
262 changed files with 2415 additions and 2600 deletions
|
@ -47,7 +47,7 @@ void DiskPartition::start_request(AsyncBlockDeviceRequest& request)
|
|||
request.add_sub_request(sub_request_or_error.release_value());
|
||||
}
|
||||
|
||||
KResultOr<size_t> DiskPartition::read(OpenFileDescription& fd, u64 offset, UserOrKernelBuffer& outbuf, size_t len)
|
||||
ErrorOr<size_t> DiskPartition::read(OpenFileDescription& fd, u64 offset, UserOrKernelBuffer& outbuf, size_t len)
|
||||
{
|
||||
unsigned adjust = m_metadata.start_block() * block_size();
|
||||
dbgln_if(OFFD_DEBUG, "DiskPartition::read offset={}, adjust={}, len={}", fd.offset(), adjust, len);
|
||||
|
@ -61,7 +61,7 @@ bool DiskPartition::can_read(const OpenFileDescription& fd, size_t offset) const
|
|||
return m_device.strong_ref()->can_read(fd, offset + adjust);
|
||||
}
|
||||
|
||||
KResultOr<size_t> DiskPartition::write(OpenFileDescription& fd, u64 offset, const UserOrKernelBuffer& inbuf, size_t len)
|
||||
ErrorOr<size_t> DiskPartition::write(OpenFileDescription& fd, u64 offset, const UserOrKernelBuffer& inbuf, size_t len)
|
||||
{
|
||||
unsigned adjust = m_metadata.start_block() * block_size();
|
||||
dbgln_if(OFFD_DEBUG, "DiskPartition::write offset={}, adjust={}, len={}", offset, adjust, len);
|
||||
|
|
|
@ -23,9 +23,9 @@ public:
|
|||
virtual void start_request(AsyncBlockDeviceRequest&) override;
|
||||
|
||||
// ^BlockDevice
|
||||
virtual KResultOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
|
||||
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
|
||||
virtual bool can_read(const OpenFileDescription&, size_t) const override;
|
||||
virtual KResultOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
|
||||
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
|
||||
virtual bool can_write(const OpenFileDescription&, size_t) const override;
|
||||
|
||||
const DiskPartitionMetadata& metadata() const;
|
||||
|
|
|
@ -55,13 +55,13 @@ void RamdiskDevice::start_request(AsyncBlockDeviceRequest& request)
|
|||
if ((offset + length > base + size) || (offset + length < base)) {
|
||||
request.complete(AsyncDeviceRequest::Failure);
|
||||
} else {
|
||||
auto result = KResult(KSuccess);
|
||||
ErrorOr<void> result;
|
||||
if (request.request_type() == AsyncBlockDeviceRequest::Read) {
|
||||
result = request.buffer().write(offset, length);
|
||||
} else {
|
||||
result = request.buffer().read(offset, length);
|
||||
}
|
||||
request.complete(result.is_success() ? AsyncDeviceRequest::Success : AsyncDeviceRequest::MemoryFault);
|
||||
request.complete(!result.is_error() ? AsyncDeviceRequest::Success : AsyncDeviceRequest::MemoryFault);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ StringView StorageDevice::class_name() const
|
|||
return "StorageDevice"sv;
|
||||
}
|
||||
|
||||
KResultOr<size_t> StorageDevice::read(OpenFileDescription&, u64 offset, UserOrKernelBuffer& outbuf, size_t len)
|
||||
ErrorOr<size_t> StorageDevice::read(OpenFileDescription&, u64 offset, UserOrKernelBuffer& outbuf, size_t len)
|
||||
{
|
||||
unsigned index = offset / block_size();
|
||||
u16 whole_blocks = len / block_size();
|
||||
|
@ -93,7 +93,7 @@ bool StorageDevice::can_read(const OpenFileDescription&, size_t offset) const
|
|||
return offset < (max_addressable_block() * block_size());
|
||||
}
|
||||
|
||||
KResultOr<size_t> StorageDevice::write(OpenFileDescription&, u64 offset, const UserOrKernelBuffer& inbuf, size_t len)
|
||||
ErrorOr<size_t> StorageDevice::write(OpenFileDescription&, u64 offset, const UserOrKernelBuffer& inbuf, size_t len)
|
||||
{
|
||||
unsigned index = offset / block_size();
|
||||
u16 whole_blocks = len / block_size();
|
||||
|
@ -188,7 +188,7 @@ bool StorageDevice::can_write(const OpenFileDescription&, size_t offset) const
|
|||
return offset < (max_addressable_block() * block_size());
|
||||
}
|
||||
|
||||
KResult StorageDevice::ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg)
|
||||
ErrorOr<void> StorageDevice::ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg)
|
||||
{
|
||||
switch (request) {
|
||||
case STORAGE_DEVICE_GET_SIZE: {
|
||||
|
|
|
@ -37,9 +37,9 @@ public:
|
|||
virtual u64 max_addressable_block() const { return m_max_addressable_block; }
|
||||
|
||||
// ^BlockDevice
|
||||
virtual KResultOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
|
||||
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
|
||||
virtual bool can_read(const OpenFileDescription&, size_t) const override;
|
||||
virtual KResultOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
|
||||
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
|
||||
virtual bool can_write(const OpenFileDescription&, size_t) const override;
|
||||
virtual void prepare_for_unplug() { m_partitions.clear(); }
|
||||
|
||||
|
@ -51,7 +51,7 @@ public:
|
|||
virtual CommandSet command_set() const = 0;
|
||||
|
||||
// ^File
|
||||
virtual KResult ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) final;
|
||||
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) final;
|
||||
|
||||
protected:
|
||||
StorageDevice(int, int, size_t, u64, NonnullOwnPtr<KString>);
|
||||
|
|
|
@ -187,7 +187,7 @@ NonnullRefPtr<FileSystem> StorageManagement::root_filesystem() const
|
|||
auto file_system = Ext2FS::try_create(description_or_error.release_value()).release_value();
|
||||
|
||||
if (auto result = file_system->initialize(); result.is_error()) {
|
||||
PANIC("StorageManagement: Couldn't open root filesystem: {}", result);
|
||||
PANIC("StorageManagement: Couldn't open root filesystem: {}", result.error());
|
||||
}
|
||||
return file_system;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue