diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-12-22 13:30:10 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-12-22 13:30:10 +0000 |
| commit | ea3d4d42e38c1add904ee19a1893ddcf005c2851 (patch) | |
| tree | 57d2f4d1c8068c8bb60826df6940feac56b7bdcd /sys/kern/uipc_usrreq.c | |
| parent | 3d4728eb9482d014039c7b52aee0db0a833b63f4 (diff) | |
Revert workaround for NFS boot, it triggers the following assert:
swakeup
sowakeup
sowwakeup
unp_connect2
unp_connect
uipc_usrreq
soconnect
sys_connect
reported by stsp@, tb@ and RT Thrush
Diffstat (limited to 'sys/kern/uipc_usrreq.c')
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 0aa7eb550bb..1c0bc22e8e3 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.105 2016/12/22 01:52:40 visa Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.106 2016/12/22 13:30:09 mpi Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -143,10 +143,7 @@ uipc_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, break; case PRU_CONNECT: - /* XXXSMP breaks atomicity */ - rw_exit_write(&netlock); error = unp_connect(so, nam, p); - rw_enter_write(&netlock); break; case PRU_CONNECT2: |