diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-03-14 22:38:44 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-03-14 22:38:44 +0000 |
| commit | 682e58989847ef3535a02c802cdf458ed00b7627 (patch) | |
| tree | 44c6a98d4ac703f9093d19fd4b8b80b300ec4213 /sys/kern | |
| parent | ed4ff4ea316834425784c12478c9bb7b87a753ad (diff) | |
Unbreak the tree, revert commitid aZ8fm4iaUnTCc0ul
This reverts the commit protecting the list and hashes in the PCB tables
with a mutex since the build of sysctl(8) breaks, as found by kettenis.
ok sthen
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_sysctl.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 85be1df3b4c..0f8d053b4c5 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.400 2022/03/14 17:23:00 bluhm Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.401 2022/03/14 22:38:43 tb Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -1366,24 +1366,16 @@ sysctl_file(int *name, u_int namelen, char *where, size_t *sizep, struct inpcb *inp; NET_LOCK(); - mtx_enter(&tcbtable.inpt_mtx); TAILQ_FOREACH(inp, &tcbtable.inpt_queue, inp_queue) FILLSO(inp->inp_socket); - mtx_leave(&tcbtable.inpt_mtx); - mtx_enter(&udbtable.inpt_mtx); TAILQ_FOREACH(inp, &udbtable.inpt_queue, inp_queue) FILLSO(inp->inp_socket); - mtx_leave(&udbtable.inpt_mtx); - mtx_enter(&rawcbtable.inpt_mtx); TAILQ_FOREACH(inp, &rawcbtable.inpt_queue, inp_queue) FILLSO(inp->inp_socket); - mtx_leave(&rawcbtable.inpt_mtx); #ifdef INET6 - mtx_enter(&rawin6pcbtable.inpt_mtx); TAILQ_FOREACH(inp, &rawin6pcbtable.inpt_queue, inp_queue) FILLSO(inp->inp_socket); - mtx_leave(&rawin6pcbtable.inpt_mtx); #endif NET_UNLOCK(); } |