sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

VFS: convert EINTR to EAGAIN for nonblocking I/O

Browse source 
The conversion was never properly implemented for asynchronous
character drivers, and got lost during the removal of the
synchronous character protocol.

Change-Id: Ib858806859aa7a52d6b391d4c6c521a2be361fdd
This commit is contained in:
David van Moolenbroek 2014-08-31 17:12:45 +00:00
parent 55f2063ed0
commit d3434cb55b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
minix/servers/vfs/device.c
View file

@ -751,7 +751,7 @@ static void cdev_generic_reply(message *m_ptr)
struct fproc *rfp; struct fproc *rfp;
struct worker_thread *wp; struct worker_thread *wp;
endpoint_t proc_e; endpoint_t proc_e;
int slot; int r, slot;
proc_e = m_ptr->m_lchardriver_vfs_reply.id; proc_e = m_ptr->m_lchardriver_vfs_reply.id;
@ -777,7 +777,13 @@ static void cdev_generic_reply(message *m_ptr)
*/ */
printf("VFS: proc %d not blocked on %d\n", proc_e, m_ptr->m_source); printf("VFS: proc %d not blocked on %d\n", proc_e, m_ptr->m_source);
} else { } else {
revive(proc_e, m_ptr->m_lchardriver_vfs_reply.status); /* Some services (inet) use the same infrastructure for nonblocking
* and cancelled requests, resulting in one of EINTR or EAGAIN when the
* other is really the appropriate code. Thus, cdev_cancel converts
* EAGAIN into EINTR, and we convert EINTR into EAGAIN here.
*/
r = m_ptr->m_lchardriver_vfs_reply.status;
revive(proc_e, (r == EINTR) ? EAGAIN : r);
} }
} }