NFS breaks building kernel

[Steve Kargl]

On Mon, Jun 29, 2009 at 04:19:07PM -0400, Rick Macklem wrote:
> 
> On Mon, 29 Jun 2009, Steve Kargl wrote:
> 
> >Am I missing something obvious?  r193272 was committed on 20090601
> >(over 28 days ago), and I haven't seen anyone else report this
> >build failure.
> >
> I believe that NFS_LEGACYRPC is no longer being supported.
> 

Oh, okay.  I didn't see anything in src/UPDATING from
the June 1 time period moving forward.

> I don't know if nfs_socket.c can be removed yet or not. (It's entire
> code body is #ifdef'd NFS_LEGACYRPC, so I don't think does anything
> any more.)

Perhaps, a

#error "NFS_LEGACYRPC kernel option is deprecated"

is needed.

The diff below fixes the build, but I don't know if its
correct.

-- 
Steve

Index: nfsclient/nfs_socket.c
===================================================================
--- nfsclient/nfs_socket.c	(revision 195169)
+++ nfsclient/nfs_socket.c	(working copy)
@@ -807,7 +807,7 @@
  * 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 @@
 	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 @@
 	return (SU_OK);
 }
 
-static void
+static int
 nfs_clnt_udp_soupcall(struct socket *so, void *arg, int waitflag)
 {
 	struct nfsmount *nmp = (struct nfsmount *)arg;
Index: nfsserver/nfs_srvsock.c
===================================================================
--- nfsserver/nfs_srvsock.c	(revision 195169)
+++ nfsserver/nfs_srvsock.c	(working copy)
@@ -527,6 +527,7 @@
 		 (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN))))
 		nfsrv_wakenfsd(slp);
 	NFSD_UNLOCK();
+	return (SU_OK);
 }