ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 09:46:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs: remove Read_result::READ_ERR_AGAIN

Browse Source 
The condition is covered by READ_ERR_WOULD_BLOCK.

Issue #4706
This commit is contained in:
Norman Feske 2022-12-20 12:11:27 +01:00 committed by Christian Helmuth
parent 1aba073e32
commit ba78cf72ae
14 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
repos/gems/include/cbe/vfs/io_job.h
View File

@ -116,10 +116,9 @@ namespace Util {
_handle.fs().complete_read(&_handle,
_data + _current_offset,
_current_count, out);
if ( result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_AGAIN
|| result == Result::READ_ERR_WOULD_BLOCK) {
if (result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_WOULD_BLOCK) {
return progress;
} else

2
repos/gems/src/app/cbe_tester/crypto.cc
View File

@ -241,7 +241,6 @@ void Crypto::_execute_decrypt_block(Job &job,
switch (result) {
case Read_result::READ_QUEUED: return;
case Read_result::READ_ERR_INTERRUPT: return;
case Read_result::READ_ERR_AGAIN: return;
case Read_result::READ_ERR_WOULD_BLOCK: return;
default: break;
}
@ -307,7 +306,6 @@ void Crypto::_execute_encrypt_block(Job &job,
switch (result) {
case Read_result::READ_QUEUED: return;
case Read_result::READ_ERR_INTERRUPT: return;
case Read_result::READ_ERR_AGAIN: return;
case Read_result::READ_ERR_WOULD_BLOCK: return;
default: break;
}

1
repos/gems/src/app/cbe_tester/main.cc
View File

@ -313,7 +313,6 @@ class Vfs_block_io_job
switch (result) {
case Result::READ_QUEUED:
case Result::READ_ERR_INTERRUPT:
case Result::READ_ERR_AGAIN:
case Result::READ_ERR_WOULD_BLOCK:
return;

3
repos/gems/src/app/cbe_tester/trust_anchor.cc
View File

@ -93,7 +93,6 @@ void Trust_anchor::_execute_write_read_operation(Vfs_handle &file,
switch (result) {
case Read_result::READ_QUEUED:
case Read_result::READ_ERR_INTERRUPT:
case Read_result::READ_ERR_AGAIN:
case Read_result::READ_ERR_WOULD_BLOCK:
return;
@ -203,7 +202,6 @@ void Trust_anchor::_execute_write_operation(Vfs_handle &file,
switch (result) {
case Read_result::READ_QUEUED:
case Read_result::READ_ERR_INTERRUPT:
case Read_result::READ_ERR_AGAIN:
case Read_result::READ_ERR_WOULD_BLOCK:
return;
@ -267,7 +265,6 @@ void Trust_anchor::_execute_read_operation(Vfs_handle &file,
switch (result) {
case Read_result::READ_QUEUED:
case Read_result::READ_ERR_INTERRUPT:
case Read_result::READ_ERR_AGAIN:
case Read_result::READ_ERR_WOULD_BLOCK:
return;

7
repos/gems/src/app/vfs_replay/component.cc
View File

@ -180,10 +180,9 @@ class Vfs_replay
_vfs_handle->fs().complete_read(_vfs_handle,
_read_buffer.local_addr<char>(),
request.current_count, out);
if ( result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_AGAIN
|| result == Result::READ_ERR_WOULD_BLOCK) {
if (result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_WOULD_BLOCK) {
return progress;
}

7
repos/gems/src/lib/vfs/cbe/io_job.h
View File

@ -92,10 +92,9 @@ namespace Vfs_cbe {
_handle.fs().complete_read(&_handle,
data + _current_offset,
_current_count, out);
if ( result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_AGAIN
|| result == Result::READ_ERR_WOULD_BLOCK) {
if (result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_WOULD_BLOCK) {
return progress;
} else

1
repos/gems/src/lib/vfs/cbe/vfs.cc
View File

@ -1344,7 +1344,6 @@ class Vfs_cbe::Wrapper
switch (r) {
case Result::READ_QUEUED: [[fallthrough]];
case Result::READ_ERR_INTERRUPT: [[fallthrough]];
case Result::READ_ERR_AGAIN: [[fallthrough]];
case Result::READ_ERR_WOULD_BLOCK: return true;
default: break;
}

2
repos/libports/src/lib/libc/vfs_plugin.cc
View File

@ -997,7 +997,6 @@ ssize_t Libc::Vfs_plugin::read(File_descriptor *fd, void *buf,
Plugin::resume_all();
switch (out_result) {
case Result::READ_ERR_AGAIN: return Errno(EAGAIN);
case Result::READ_ERR_WOULD_BLOCK: return Errno(EWOULDBLOCK);
case Result::READ_ERR_INVALID: return Errno(EINVAL);
case Result::READ_ERR_IO: return Errno(EIO);
@ -2217,7 +2216,6 @@ ssize_t Libc::Vfs_plugin::readlink(const char *link_path, char *buf, ::size_t bu
switch (out_result) {
case Result::READ_QUEUED: return Fn::INCOMPLETE;;
case Result::READ_ERR_AGAIN: result_errno = EAGAIN; break;
case Result::READ_ERR_WOULD_BLOCK: result_errno = EWOULDBLOCK; break;
case Result::READ_ERR_INVALID: result_errno = EINVAL; break;
case Result::READ_ERR_IO: result_errno = EIO; break;

2
repos/os/include/os/vfs.h
View File

@ -478,7 +478,7 @@ class Genode::Readonly_file : public File
};
/*
* XXX handle READ_ERR_AGAIN, READ_ERR_WOULD_BLOCK, READ_QUEUED
* XXX handle READ_ERR_WOULD_BLOCK, READ_QUEUED
*/
if (result != Vfs::File_io_service::READ_OK)

7
repos/os/include/vfs/file_io_service.h
View File

@ -39,10 +39,9 @@ struct Vfs::File_io_service : Interface
** Read **
**********/
enum Read_result { READ_ERR_AGAIN, READ_ERR_WOULD_BLOCK,
READ_ERR_INVALID, READ_ERR_IO,
READ_ERR_INTERRUPT, READ_QUEUED,
READ_OK };
enum Read_result { READ_ERR_WOULD_BLOCK, READ_ERR_INVALID,
READ_ERR_IO, READ_ERR_INTERRUPT,
READ_QUEUED, READ_OK };
/**
* Queue read operation

1
repos/os/include/vfs/print.h
View File

@ -149,7 +149,6 @@ static inline void print(Genode::Output &output, Vfs::File_io_service::Read_resu
switch (r) {
CASE_PRINT(READ_OK);
CASE_PRINT(READ_ERR_AGAIN);
CASE_PRINT(READ_ERR_WOULD_BLOCK);
CASE_PRINT(READ_ERR_INVALID);
CASE_PRINT(READ_ERR_IO);

1
repos/os/src/server/vfs/node.h
View File

@ -392,7 +392,6 @@ class Vfs_server::Io_node : public Vfs_server::Node,
break;
case Read_result::READ_ERR_WOULD_BLOCK:
case Read_result::READ_ERR_AGAIN:
case Read_result::READ_ERR_INTERRUPT:
case Read_result::READ_QUEUED:
break;

7
repos/os/src/server/vfs_block/job.h
View File

@ -88,10 +88,9 @@ namespace Vfs_block {
_handle.fs().complete_read(&_handle,
data + current_offset,
current_count, out);
if ( result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_AGAIN
|| result == Result::READ_ERR_WOULD_BLOCK) {
if (result == Result::READ_QUEUED
|| result == Result::READ_ERR_INTERRUPT
|| result == Result::READ_ERR_WOULD_BLOCK) {
return progress;
} else

2
repos/os/src/test/vfs_stress/main.cc
View File

@ -112,8 +112,6 @@ inline void assert_read(Vfs::File_io_service::Read_result r)
case Result::READ_OK: return;
case Result::READ_QUEUED:
error("READ_QUEUED"); break;
case Result::READ_ERR_AGAIN:
error("READ_ERR_AGAIN"); break;
case Result::READ_ERR_WOULD_BLOCK:
error("READ_ERR_WOULD_BLOCK"); break;
case Result::READ_ERR_INVALID: