RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-01 10:42:07 +00:00
Code Issues Activity Actions

Ext2FS: Clarify error handling in Ext2FSInode::read_bytes() somewhat

Browse source
This commit is contained in:
Andreas Kling 2021-04-10 10:58:19 +02:00
parent 19fb62dd15
commit b5b38d372c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -900,10 +900,10 @@ ssize_t Ext2FSInode::read_bytes(off_t offset, ssize_t count, UserOrKernelBuffer&
size_t offset_into_block = (bi == first_block_logical_index) ? offset_into_first_block : 0;
size_t num_bytes_to_copy = min((off_t)block_size - offset_into_block, remaining_count);
auto buffer_offset = buffer.offset(nread);
int err = fs().read_block(block_index, &buffer_offset, num_bytes_to_copy, offset_into_block, allow_cache);
if (err < 0) {
auto result = fs().read_block(block_index, &buffer_offset, num_bytes_to_copy, offset_into_block, allow_cache);
if (result.is_error()) {
dmesgln("Ext2FSInode[{}]::read_bytes(): Failed to read block {} (index {})", identifier(), block_index.value(), bi);
return err;
return result.error();
}
remaining_count -= num_bytes_to_copy;
nread += num_bytes_to_copy;