svn commit: r195181 - in head/sys: nfsclient nfsserver

[John Baldwin]

Author: jhb
Date: Tue Jun 30 03:18:51 2009
New Revision: 195181
URL: http://svn.freebsd.org/changeset/base/195181

Log:
  Fix build with NFS_LEGACYRPC enabled after the socket upcall locking
  changes.
  
  Approved by:	re (kensmith)

Modified:
  head/sys/nfsclient/nfs_socket.c
  head/sys/nfsserver/nfs_srvsock.c

Modified: head/sys/nfsclient/nfs_socket.c
==============================================================================
--- head/sys/nfsclient/nfs_socket.c	Tue Jun 30 03:05:50 2009	(r195180)
+++ head/sys/nfsclient/nfs_socket.c	Tue Jun 30 03:18:51 2009	(r195181)
@@ -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,
 	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;

Modified: head/sys/nfsserver/nfs_srvsock.c
==============================================================================
--- head/sys/nfsserver/nfs_srvsock.c	Tue Jun 30 03:05:50 2009	(r195180)
+++ head/sys/nfsserver/nfs_srvsock.c	Tue Jun 30 03:18:51 2009	(r195181)
@@ -527,6 +527,7 @@ dorecs:
 		 (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN))))
 		nfsrv_wakenfsd(slp);
 	NFSD_UNLOCK();
+	return (SU_OK);
 }
 
 /*