d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new SB_UPCALL flag,

Browse Source 
Obtained from:  NetBSD (but I changed the flag clear order in case).
This commit is contained in:
Peter Wemm 1998-05-31 18:46:06 +00:00
parent 04a3fd1276
commit d0e443aa3a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/nfs/nfs_syscalls.c
View File

@ -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)

5
sys/nfsclient/nfs_nfsiod.c
View File

@ -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)

5
sys/nfsserver/nfs_syscalls.c
View File

@ -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)