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

Remove spls from NFS server setup call; expand receive socket buffer

Browse Source 
locking to cover full setup of socket upcalls; remove XXX about
locking.

MFC after:	3 weeks
This commit is contained in:
rwatson 2008-06-30 20:43:06 +00:00
parent 0637892261
commit 8805d22e34
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/nfsserver/nfs_syscalls.c
View File

@ -187,7 +187,7 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam, struct thread *td)
int siz;
struct nfssvc_sock *slp;
struct socket *so;
int error, s;
int error;
so = fp->f_data;
#if 0
@ -267,18 +267,13 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam, struct thread *td)
slp->ns_nam = mynam;
fhold(fp);
slp->ns_fp = fp;
/*
* XXXRW: Socket locking here?
*/
s = splnet();
SOCKBUF_LOCK(&so->so_rcv);
so->so_upcallarg = (caddr_t)slp;
so->so_upcall = nfsrv_rcv;
SOCKBUF_LOCK(&so->so_rcv);
so->so_rcv.sb_flags |= SB_UPCALL;
SOCKBUF_UNLOCK(&so->so_rcv);
slp->ns_flag = (SLP_VALID | SLP_NEEDQ);
nfsrv_wakenfsd(slp);
splx(s);
NFSD_UNLOCK();
return (0);
}
@ -597,9 +592,9 @@ nfsrv_zapsock(struct nfssvc_sock *slp)
so = slp->ns_so;
SOCKBUF_LOCK(&so->so_rcv);
so->so_rcv.sb_flags &= ~SB_UPCALL;
SOCKBUF_UNLOCK(&so->so_rcv);
so->so_upcall = NULL;
so->so_upcallarg = NULL;
SOCKBUF_UNLOCK(&so->so_rcv);
soshutdown(so, SHUT_RDWR);
closef(fp, NULL);
NFSD_LOCK();