ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vfs: handle read error in fs file system 

Issue #3742
This commit is contained in:
Christian Prochaska 2020-04-26 22:55:53 +02:00 committed by Norman Feske
parent 6a8fb48c13
commit 151828752c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/os/src/lib/vfs/fs_file_system.h
View File

@ -172,24 +172,28 @@ class Vfs::Fs_file_system : public File_system
if (queued_read_state != Handle_state::Queued_state::ACK) if (queued_read_state != Handle_state::Queued_state::ACK)
return READ_QUEUED; return READ_QUEUED;
::File_system::Session::Tx::Source &source = *_fs.tx();
/* obtain result packet descriptor with updated status info */ /* obtain result packet descriptor with updated status info */
::File_system::Packet_descriptor const ::File_system::Packet_descriptor const
packet = queued_read_packet; packet = queued_read_packet;
file_size const read_num_bytes = min(packet.length(), count); Read_result result = packet.succeeded() ? READ_OK : READ_ERR_IO;
::File_system::Session::Tx::Source &source = *_fs.tx(); if (result == READ_OK) {
file_size const read_num_bytes = min(packet.length(), count);
memcpy(dst, source.packet_content(packet), read_num_bytes); memcpy(dst, source.packet_content(packet), read_num_bytes);
out_count = read_num_bytes;
}
queued_read_state = Handle_state::Queued_state::IDLE; queued_read_state = Handle_state::Queued_state::IDLE;
queued_read_packet = ::File_system::Packet_descriptor(); queued_read_packet = ::File_system::Packet_descriptor();
out_count = read_num_bytes;
source.release_packet(packet); source.release_packet(packet);
return READ_OK; return result;
} }
Fs_vfs_handle(File_system &fs, Allocator &alloc, Fs_vfs_handle(File_system &fs, Allocator &alloc,