diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-06-20 09:10:05 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-06-20 09:10:05 +0000 |
| commit | 0f26878960c82a6f407699564dcb2dae1a1a82f3 (patch) | |
| tree | aaed41255ae9f2ba4bf89cef395059db376cb93c /sys | |
| parent | 70aa71b07fe56cd80e180772ff456dc25ff281d3 (diff) | |
Convert sodidle() to timeout_set_proc(9), it needs a process context
to grab the rwlock.
Problem reported by Rivo Nurges.
ok bluhm@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/uipc_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 1241f47479c..a65a49e45fa 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.186 2017/05/31 08:55:10 markus Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.187 2017/06/20 09:10:04 mpi Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1157,7 +1157,7 @@ sosplice(struct socket *so, int fd, off_t max, struct timeval *tv) so->so_idletv = *tv; else timerclear(&so->so_idletv); - timeout_set(&so->so_idleto, soidle, so); + timeout_set_proc(&so->so_idleto, soidle, so); task_set(&so->so_splicetask, sotask, so); /* |