diff options
| author |   mpi <mpi@openbsd.org> | 2020-05-28 07:17:50 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2020-05-28 07:17:50 +0000 |
| commit | 388cf6ec614338a025d8aafc4039b67ca6235390 (patch) | |
| tree | 2eaeac8adceb768bdfacddd49b5f83b930ccaf3f | |
| parent | fix Include before Match in sshd_config; bz#3122 patch from Jakub Jelen (diff) | |
| download | wireguard-openbsd-388cf6ec614338a025d8aafc4039b67ca6235390.tar.xz wireguard-openbsd-388cf6ec614338a025d8aafc4039b67ca6235390.zip | |
File allocation in socket(2) & socketpair(2) no longer need the KERNEL_LOCK().
Bring the two syscalls in sync with recent MP changes in the file layer.
Inconsistency pointed by haesbaert@.
ok anton@, visa@
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index e3661b5f16c..b898bab546e 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.184 2020/01/15 13:17:35 mpi Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.185 2020/05/28 07:17:50 mpi Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -97,7 +97,6 @@ sys_socket(struct proc *p, void *v, register_t *retval) if (error) return (error); - KERNEL_LOCK(); fdplock(fdp); error = falloc(p, &fp, &fd); if (error) { @@ -114,7 +113,6 @@ sys_socket(struct proc *p, void *v, register_t *retval) FRELE(fp, p); *retval = fd; } - KERNEL_UNLOCK(); return (error); } @@ -450,7 +448,6 @@ sys_socketpair(struct proc *p, void *v, register_t *retval) if (error != 0) goto free2; } - KERNEL_LOCK(); fdplock(fdp); if ((error = falloc(p, &fp1, &sv[0])) != 0) goto free3; @@ -475,7 +472,6 @@ sys_socketpair(struct proc *p, void *v, register_t *retval) fdpunlock(fdp); FRELE(fp1, p); FRELE(fp2, p); - KERNEL_UNLOCK(); return (0); } fdremove(fdp, sv[1]); @@ -487,7 +483,6 @@ free4: so1 = NULL; free3: fdpunlock(fdp); - KERNEL_UNLOCK(); free2: if (so2 != NULL) (void)soclose(so2, 0); |