diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-25 16:45:51 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-25 16:45:51 +0000 |
| commit | d44640ffa7df79fbffd00e4e8f004d2ce2b4f071 (patch) | |
| tree | 605ace69bc623877961b8b0e32f74a2dfed48de8 | |
| parent | 7fe001cf59d05e6ff03434fa48e36f99d16e4a74 (diff) | |
As NET_LOCK() is a read/write lock, it can sleep in sotask(). So
the TASKQ_CANTSLEEP flag is no longer valid for the splicing thread.
OK mikeb@
| -rw-r--r-- | sys/kern/uipc_socket.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 06a1340e457..186fc918b98 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.172 2017/01/25 06:15:50 mpi Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.173 2017/01/25 16:45:50 bluhm Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1074,8 +1074,7 @@ sosplice(struct socket *so, int fd, off_t max, struct timeval *tv) int s, error = 0; if (sosplice_taskq == NULL) - sosplice_taskq = taskq_create("sosplice", 1, IPL_SOFTNET, - TASKQ_CANTSLEEP); + sosplice_taskq = taskq_create("sosplice", 1, IPL_SOFTNET, 0); if (sosplice_taskq == NULL) return (ENOMEM); |