From owner-svn-src-all@FreeBSD.ORG  Tue Jun 30 03:18:51 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 768FB1065673;
	Tue, 30 Jun 2009 03:18:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 64D0B8FC08;
	Tue, 30 Jun 2009 03:18:51 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5U3IpR8066648;
	Tue, 30 Jun 2009 03:18:51 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5U3Ipr4066645;
	Tue, 30 Jun 2009 03:18:51 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200906300318.n5U3Ipr4066645@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 30 Jun 2009 03:18:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195181 - in head/sys: nfsclient nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jun 2009 03:18:51 -0000

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);
 }
 
 /*