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

Fix build with NFS_LEGACYRPC enabled after the socket upcall locking

Browse Source 
changes.

Approved by:	re (kensmith)
This commit is contained in:
John Baldwin 2009-06-30 03:18:51 +00:00
parent 86120afae4
commit 5ed6940d13
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=195181
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/nfsclient/nfs_socket.c
View File

@ -807,7 +807,7 @@ nfs_reply(struct nfsreq *rep)
* XXX TO DO
* Make nfs_realign() non-blocking. Also make nfsm_dissect() nonblocking.
*/
static int
static void
nfs_clnt_match_xid(struct socket *so,
struct nfsmount *nmp,
struct mbuf *mrep)
@ -947,7 +947,7 @@ nfs_copy_len(struct mbuf *mp, char *buf, int len)
return (len);
}
static void
static int
nfs_clnt_tcp_soupcall(struct socket *so, void *arg, int waitflag)
{
struct nfsmount *nmp = (struct nfsmount *)arg;
@ -1085,7 +1085,7 @@ nfs_clnt_tcp_soupcall(struct socket *so, void *arg, int waitflag)
return (SU_OK);
}
static void
static int
nfs_clnt_udp_soupcall(struct socket *so, void *arg, int waitflag)
{
struct nfsmount *nmp = (struct nfsmount *)arg;

1
sys/nfsserver/nfs_srvsock.c
View File

@ -527,6 +527,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
(slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN))))
nfsrv_wakenfsd(slp);
NFSD_UNLOCK();
return (SU_OK);
}
/*