summaryrefslogtreecommitdiffstats
path: root/sys/nfsserver
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1998-05-31 18:46:06 +0000
committerpeter <peter@FreeBSD.org>1998-05-31 18:46:06 +0000
commit985cae8566eb17adf4fec3db796796b71d381886 (patch)
treeecec02a48c5d54aa6dbde711d9673b5e792e11a3 /sys/nfsserver
parent10677f7b5c74e63360b808c734c4baee09455f8b (diff)
downloadFreeBSD-src-985cae8566eb17adf4fec3db796796b71d381886.zip
FreeBSD-src-985cae8566eb17adf4fec3db796796b71d381886.tar.gz
Use the new SB_UPCALL flag,
Obtained from: NetBSD (but I changed the flag clear order in case).
Diffstat (limited to 'sys/nfsserver')
-rw-r--r--sys/nfsserver/nfs_syscalls.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 94f33e2..2f07161 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.38 1998/05/19 07:11:25 peter Exp $
+ * $Id: nfs_syscalls.c,v 1.39 1998/05/31 17:27:53 peter Exp $
*/
#include <sys/param.h>
@@ -433,6 +433,7 @@ nfssvc_addsock(fp, mynam, p)
s = splnet();
so->so_upcallarg = (caddr_t)slp;
so->so_upcall = nfsrv_rcv;
+ so->so_rcv.sb_flags |= SB_UPCALL;
slp->ns_flag = (SLP_VALID | SLP_NEEDQ);
nfsrv_wakenfsd(slp);
splx(s);
@@ -770,7 +771,9 @@ nfsrv_zapsock(slp)
if (fp) {
slp->ns_fp = (struct file *)0;
so = slp->ns_so;
+ so->so_rcv.sb_flags &= ~SB_UPCALL;
so->so_upcall = NULL;
+ so->so_upcallarg = NULL;
soshutdown(so, 2);
closef(fp, (struct proc *)0);
if (slp->ns_nam)
OpenPOWER on IntegriCloud