summaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_syscalls.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2018-06-06 06:55:23 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2018-06-06 06:55:23 +0000
commit74ae735dc00571554d21c96495d3f4db8cf61232 (patch)
tree8d455bd05235d0e6943ea13b550f240dd5d41b5a /sys/nfs/nfs_syscalls.c
parent4bfe4a74ff0d1a4718c00b31d4e10011a2b9470e (diff)
Pass the socket to sounlock(), this prepare the terrain for per-socket
locking. ok visa@, bluhm@
Diffstat (limited to 'sys/nfs/nfs_syscalls.c')
-rw-r--r--sys/nfs/nfs_syscalls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 527a61a37de..2e1f43eb7fc 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_syscalls.c,v 1.113 2018/02/19 08:59:53 mpi Exp $ */
+/* $OpenBSD: nfs_syscalls.c,v 1.114 2018/06/06 06:55:22 mpi Exp $ */
/* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */
/*
@@ -250,7 +250,7 @@ nfssvc_addsock(struct file *fp, struct mbuf *mynam)
s = solock(so);
error = soreserve(so, siz, siz);
if (error) {
- sounlock(s);
+ sounlock(so, s);
m_freem(mynam);
return (error);
}
@@ -279,7 +279,7 @@ nfssvc_addsock(struct file *fp, struct mbuf *mynam)
so->so_rcv.sb_timeo = 0;
so->so_snd.sb_flags &= ~SB_NOINTR;
so->so_snd.sb_timeo = 0;
- sounlock(s);
+ sounlock(so, s);
if (tslp)
slp = tslp;
else {