diff options
Diffstat (limited to 'sys/compat/svr4/svr4_filio.c')
-rw-r--r-- | sys/compat/svr4/svr4_filio.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index ef9b8b6..5527716 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -116,15 +116,17 @@ svr4_sys_read(td, uap) if (fp->f_type == DTYPE_SOCKET) { so = (struct socket *)fp->f_data; - DPRINTF(("fd %d is a socket\n", SCARG(uap, fd))); - if (so->so_state & SS_ASYNC) { - DPRINTF(("fd %d is an ASYNC socket!\n", SCARG(uap, fd))); - } - DPRINTF(("Here are its flags: 0x%x\n", so->so_state)); -#if defined(GROTTY_READ_HACK) + SOCK_LOCK(so); so_state = so->so_state; +#if defined(GROTTY_READ_HACK) so->so_state &= ~SS_NBIO; #endif + SOCK_UNLOCK(so); + DPRINTF(("fd %d is a socket\n", SCARG(uap, fd))); + if (so_state & SS_ASYNC) { + DPRINTF(("fd %d is an ASYNC socket!\n", SCARG(uap, fd))); + } + DPRINTF(("Here are its flags: 0x%x\n", so_state)); } rv = read(td, &ra); @@ -140,7 +142,9 @@ svr4_sys_read(td, uap) #if defined(GROTTY_READ_HACK) if (so) { /* We've already checked to see if this is a socket */ + SOCK_LOCK(so); so->so_state = so_state; + SOCK_UNLOCK(so); } #endif fdrop(fp, td); |