diff --git a/repos/gems/include/cbe/vfs/io_job.h b/repos/gems/include/cbe/vfs/io_job.h index f89e5bd64d..54b2fe1ee7 100644 --- a/repos/gems/include/cbe/vfs/io_job.h +++ b/repos/gems/include/cbe/vfs/io_job.h @@ -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 diff --git a/repos/gems/src/app/cbe_tester/crypto.cc b/repos/gems/src/app/cbe_tester/crypto.cc index 9a676e7bd9..889afede86 100644 --- a/repos/gems/src/app/cbe_tester/crypto.cc +++ b/repos/gems/src/app/cbe_tester/crypto.cc @@ -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; } diff --git a/repos/gems/src/app/cbe_tester/main.cc b/repos/gems/src/app/cbe_tester/main.cc index a46ec86051..6d80476ae0 100644 --- a/repos/gems/src/app/cbe_tester/main.cc +++ b/repos/gems/src/app/cbe_tester/main.cc @@ -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; diff --git a/repos/gems/src/app/cbe_tester/trust_anchor.cc b/repos/gems/src/app/cbe_tester/trust_anchor.cc index b281370f98..8f90413202 100644 --- a/repos/gems/src/app/cbe_tester/trust_anchor.cc +++ b/repos/gems/src/app/cbe_tester/trust_anchor.cc @@ -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; diff --git a/repos/gems/src/app/vfs_replay/component.cc b/repos/gems/src/app/vfs_replay/component.cc index 50205300d8..03e64716a7 100644 --- a/repos/gems/src/app/vfs_replay/component.cc +++ b/repos/gems/src/app/vfs_replay/component.cc @@ -180,10 +180,9 @@ class Vfs_replay _vfs_handle->fs().complete_read(_vfs_handle, _read_buffer.local_addr(), 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; } diff --git a/repos/gems/src/lib/vfs/cbe/io_job.h b/repos/gems/src/lib/vfs/cbe/io_job.h index 3f93d67e8c..05ff017f96 100644 --- a/repos/gems/src/lib/vfs/cbe/io_job.h +++ b/repos/gems/src/lib/vfs/cbe/io_job.h @@ -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 diff --git a/repos/gems/src/lib/vfs/cbe/vfs.cc b/repos/gems/src/lib/vfs/cbe/vfs.cc index 2eff57abd0..d24684f5f4 100644 --- a/repos/gems/src/lib/vfs/cbe/vfs.cc +++ b/repos/gems/src/lib/vfs/cbe/vfs.cc @@ -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; } diff --git a/repos/libports/src/lib/libc/vfs_plugin.cc b/repos/libports/src/lib/libc/vfs_plugin.cc index 9d3f6155fa..3a782fe162 100644 --- a/repos/libports/src/lib/libc/vfs_plugin.cc +++ b/repos/libports/src/lib/libc/vfs_plugin.cc @@ -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; diff --git a/repos/os/include/os/vfs.h b/repos/os/include/os/vfs.h index 97fccc3340..eae9aea560 100644 --- a/repos/os/include/os/vfs.h +++ b/repos/os/include/os/vfs.h @@ -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) diff --git a/repos/os/include/vfs/file_io_service.h b/repos/os/include/vfs/file_io_service.h index 596cb78343..1bd997578c 100644 --- a/repos/os/include/vfs/file_io_service.h +++ b/repos/os/include/vfs/file_io_service.h @@ -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 diff --git a/repos/os/include/vfs/print.h b/repos/os/include/vfs/print.h index eea316a726..e9ec0d7f1a 100644 --- a/repos/os/include/vfs/print.h +++ b/repos/os/include/vfs/print.h @@ -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); diff --git a/repos/os/src/server/vfs/node.h b/repos/os/src/server/vfs/node.h index 5ccd38c5f9..7b731fe52a 100644 --- a/repos/os/src/server/vfs/node.h +++ b/repos/os/src/server/vfs/node.h @@ -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; diff --git a/repos/os/src/server/vfs_block/job.h b/repos/os/src/server/vfs_block/job.h index e9273fb4cc..d6a2f57345 100644 --- a/repos/os/src/server/vfs_block/job.h +++ b/repos/os/src/server/vfs_block/job.h @@ -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 diff --git a/repos/os/src/test/vfs_stress/main.cc b/repos/os/src/test/vfs_stress/main.cc index 95458576e9..628488b516 100644 --- a/repos/os/src/test/vfs_stress/main.cc +++ b/repos/os/src/test/vfs_stress/main.cc @@ -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: