diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-01-31 12:16:21 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-01-31 12:16:21 +0000 |
| commit | ee1eb06a640d258878425ad2234f79b4c1e05285 (patch) | |
| tree | e0cacafe070d42c0efca9e99dc9e8df4ab2112b6 /sys/kern | |
| parent | a8fff0ed95b45f3fc21758750b0bbbf4fa0a4133 (diff) | |
Remove the inifioctl hack, checking for an unheld NET_LOCK() in
tsleep(9) & friends seem to only produce false positives and cannot
be easily disabled.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_synch.c | 12 | ||||
| -rw-r--r-- | sys/kern/sys_socket.c | 9 |
2 files changed, 2 insertions, 19 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 9a581b09cf9..a2e7347d74b 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_synch.c,v 1.137 2017/01/25 21:59:41 mpi Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.138 2017/01/31 12:16:20 mpi Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /* @@ -111,11 +111,6 @@ tsleep(const volatile void *ident, int priority, const char *wmesg, int timo) int hold_count; #endif -#if 1 - extern int inifioctl; - if (!inifioctl) - NET_ASSERT_UNLOCKED(); -#endif KASSERT((priority & ~(PRIMASK | PCATCH)) == 0); #ifdef MULTIPROCESSOR @@ -175,11 +170,6 @@ msleep(const volatile void *ident, struct mutex *mtx, int priority, int hold_count; #endif -#if 1 - extern int inifioctl; - if (!inifioctl) - NET_ASSERT_UNLOCKED(); -#endif KASSERT((priority & ~(PRIMASK | PCATCH | PNORELOCK)) == 0); KASSERT(mtx != NULL); diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 7a54f093206..5e969cd8164 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_socket.c,v 1.27 2017/01/25 21:59:41 mpi Exp $ */ +/* $OpenBSD: sys_socket.c,v 1.28 2017/01/31 12:16:20 mpi Exp $ */ /* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */ /* @@ -121,14 +121,7 @@ soo_ioctl(struct file *fp, u_long cmd, caddr_t data, struct proc *p) */ if (IOCGROUP(cmd) == 'i') { NET_LOCK(s); -#if 1 - extern int inifioctl; - inifioctl = 1; -#endif error = ifioctl(so, cmd, data, p); -#if 1 - inifioctl = 0; -#endif NET_UNLOCK(s); return (error); } |