From owner-freebsd-current@FreeBSD.ORG  Mon Jun 29 20:24:39 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1014F106567C
	for <freebsd-current@freebsd.org>; Mon, 29 Jun 2009 20:24:39 +0000 (UTC)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu
	[128.208.78.105])
	by mx1.freebsd.org (Postfix) with ESMTP id CB6EF8FC16
	for <freebsd-current@freebsd.org>; Mon, 29 Jun 2009 20:24:38 +0000 (UTC)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: from troutmask.apl.washington.edu (localhost.apl.washington.edu
	[127.0.0.1])
	by troutmask.apl.washington.edu (8.14.3/8.14.3) with ESMTP id
	n5TKOc3U099385; Mon, 29 Jun 2009 13:24:38 -0700 (PDT)
	(envelope-from sgk@troutmask.apl.washington.edu)
Received: (from sgk@localhost)
	by troutmask.apl.washington.edu (8.14.3/8.14.3/Submit) id
	n5TKOcRv099374; Mon, 29 Jun 2009 13:24:38 -0700 (PDT)
	(envelope-from sgk)
Date: Mon, 29 Jun 2009 13:24:38 -0700
From: Steve Kargl <sgk@troutmask.apl.washington.edu>
To: Rick Macklem <rmacklem@uoguelph.ca>
Message-ID: <20090629202438.GA69990@troutmask.apl.washington.edu>
References: <20090629184451.GA13281@troutmask.apl.washington.edu>
	<Pine.GSO.4.63.0906291616360.26174@muncher.cs.uoguelph.ca>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <Pine.GSO.4.63.0906291616360.26174@muncher.cs.uoguelph.ca>
User-Agent: Mutt/1.4.2.3i
Cc: freebsd-current@freebsd.org
Subject: Re: NFS breaks building kernel
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jun 2009 20:24:39 -0000

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