summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2009-06-30 03:18:51 +0000
committerjhb <jhb@FreeBSD.org>2009-06-30 03:18:51 +0000
commitccb2608d0655fc838c5dfdb0fd781cb889fe84c8 (patch)
treed25af1f3da1f61f2f2a9594859c964e5684b55b2
parent3de2232b431b0fc22153f5286da9948f67b3d80e (diff)
downloadFreeBSD-src-ccb2608d0655fc838c5dfdb0fd781cb889fe84c8.zip
FreeBSD-src-ccb2608d0655fc838c5dfdb0fd781cb889fe84c8.tar.gz
Fix build with NFS_LEGACYRPC enabled after the socket upcall locking
changes. Approved by: re (kensmith)
-rw-r--r--sys/nfsclient/nfs_socket.c6
-rw-r--r--sys/nfsserver/nfs_srvsock.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 1ae31a5..26b365c 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -807,7 +807,7 @@ tryagain:
* 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 @@ mark_reconnect:
return (SU_OK);
}
-static void
+static int
nfs_clnt_udp_soupcall(struct socket *so, void *arg, int waitflag)
{
struct nfsmount *nmp = (struct nfsmount *)arg;
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 0bb4128..b5c3fa2 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -527,6 +527,7 @@ dorecs:
(slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN))))
nfsrv_wakenfsd(slp);
NFSD_UNLOCK();
+ return (SU_OK);
}
/*
OpenPOWER on IntegriCloud