Redo the sigio locking.

Turn the sigio sx into a mutex.

Sigio lock is really only needed to protect interrupts from dereferencing
the sigio pointer in an object when the sigio itself is being destroyed.

In order to do this in the most unintrusive manner change pgsigio's
sigio * argument into a **, that way we can lock internally to the
function.

1 files changed, 0 insertions, 5 deletions

diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index 79e4831..68f1045 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -39,15 +39,12 @@
 #include <sys/domain.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/mutex.h>
 #include <sys/protosw.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/sx.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
@@ -430,10 +427,8 @@ key_attach(struct socket *so, int proto, struct thread *td)
 	key_cb.any_count++;
 	kp->kp_raw.rcb_laddr = &key_src;
 	kp->kp_raw.rcb_faddr = &key_dst;
-	SIGIO_SLOCK();
 	soisconnected_locked(so);
 	so->so_options |= SO_USELOOPBACK;
-	SIGIO_SUNLOCK();
 
 	splx(s);
 	return 0;