From owner-svn-src-head@FreeBSD.ORG  Fri Nov 14 11:27:53 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1112106567F;
	Fri, 14 Nov 2008 11:27:53 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D72118FC13;
	Fri, 14 Nov 2008 11:27:53 +0000 (UTC) (envelope-from dfr@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 mAEBRrFV091181;
	Fri, 14 Nov 2008 11:27:53 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAEBRrpB091178;
	Fri, 14 Nov 2008 11:27:53 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811141127.mAEBRrpB091178@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Fri, 14 Nov 2008 11:27:53 +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: r184969 - in head/sys: conf nfsclient nfsserver
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2008 11:27:54 -0000

Author: dfr
Date: Fri Nov 14 11:27:53 2008
New Revision: 184969
URL: http://svn.freebsd.org/changeset/base/184969

Log:
  Switch the default rpc implementation for NFS back to the new code. I believe
  I have fixed the reported problems - if you still have trouble with it, please
  contact me with as much detail as possible so that I can track down any other
  issues as quickly as possible.

Modified:
  head/sys/conf/options
  head/sys/nfsclient/nfs.h
  head/sys/nfsserver/nfs.h

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Fri Nov 14 11:23:02 2008	(r184968)
+++ head/sys/conf/options	Fri Nov 14 11:27:53 2008	(r184969)
@@ -230,7 +230,6 @@ NFS4CLIENT	opt_nfs.h
 # legacy RPC implementation instead of the newer KRPC system (which
 # supports modern features such as RPCSEC_GSS
 NFS_LEGACYRPC	opt_nfs.h
-NFS_NEWRPC	opt_nfs.h
 
 # filesystems and libiconv bridge
 CD9660_ICONV	opt_dontuse.h

Modified: head/sys/nfsclient/nfs.h
==============================================================================
--- head/sys/nfsclient/nfs.h	Fri Nov 14 11:23:02 2008	(r184968)
+++ head/sys/nfsclient/nfs.h	Fri Nov 14 11:27:53 2008	(r184969)
@@ -40,10 +40,6 @@
 #include "opt_nfs.h"
 #endif
 
-#if !defined(NFS_NEWRPC) && !defined(NFS_LEGACYRPC)
-#define NFS_LEGACYRPC
-#endif
-
 #include <nfsclient/nfsargs.h>
 
 /*

Modified: head/sys/nfsserver/nfs.h
==============================================================================
--- head/sys/nfsserver/nfs.h	Fri Nov 14 11:23:02 2008	(r184968)
+++ head/sys/nfsserver/nfs.h	Fri Nov 14 11:27:53 2008	(r184969)
@@ -40,10 +40,6 @@
 #include "opt_nfs.h"
 #endif
 
-#if !defined(NFS_NEWRPC) && !defined(NFS_LEGACYRPC)
-#define NFS_LEGACYRPC
-#endif
-
 /*
  * Tunable constants for nfs
  */