From ea3d4d42e38c1add904ee19a1893ddcf005c2851 Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Thu, 22 Dec 2016 13:30:10 +0000 Subject: 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 --- sys/kern/uipc_usrreq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sys/kern/uipc_usrreq.c') 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: -- cgit v1.2.3