Date: Thu, 13 Nov 2008 11:35:18 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184920 - in head/sys: conf nfsclient nfsserver Message-ID: <200811131135.mADBZIbU058019@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dfr Date: Thu Nov 13 11:35:18 2008 New Revision: 184920 URL: http://svn.freebsd.org/changeset/base/184920 Log: Temporarily switch NFS back to the old RPC code while I try to diagnose and fix the problems a few people have noticed with the new code. People who want to continue testing the new code or who need RPCSEC_GSS support should use the new option NFS_NEWRPC to select it. Modified: head/sys/conf/files head/sys/conf/options head/sys/nfsclient/nfs.h head/sys/nfsserver/nfs.h Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Thu Nov 13 11:07:17 2008 (r184919) +++ head/sys/conf/files Thu Nov 13 11:35:18 2008 (r184920) @@ -2296,7 +2296,7 @@ nfsclient/krpc_subr.c optional bootp nf nfsclient/nfs_bio.c optional nfsclient nfsclient/nfs_diskless.c optional nfsclient nfs_root nfsclient/nfs_node.c optional nfsclient -nfsclient/nfs_socket.c optional nfsclient nfs_legacyrpc +nfsclient/nfs_socket.c optional nfsclient nfsclient/nfs_krpc.c optional nfsclient nfsclient/nfs_subs.c optional nfsclient nfsclient/nfs_nfsiod.c optional nfsclient @@ -2306,10 +2306,10 @@ nfsclient/nfs_lock.c optional nfsclient nfsserver/nfs_fha.c optional nfsserver nfsserver/nfs_serv.c optional nfsserver nfsserver/nfs_srvkrpc.c optional nfsserver -nfsserver/nfs_srvsock.c optional nfsserver nfs_legacyrpc -nfsserver/nfs_srvcache.c optional nfsserver nfs_legacyrpc +nfsserver/nfs_srvsock.c optional nfsserver +nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver -nfsserver/nfs_syscalls.c optional nfsserver nfs_legacyrpc +nfsserver/nfs_syscalls.c optional nfsserver nlm/nlm_advlock.c optional nfslockd nfsclient nlm/nlm_prot_clnt.c optional nfslockd nlm/nlm_prot_impl.c optional nfslockd Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Thu Nov 13 11:07:17 2008 (r184919) +++ head/sys/conf/options Thu Nov 13 11:35:18 2008 (r184920) @@ -230,6 +230,7 @@ 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 Thu Nov 13 11:07:17 2008 (r184919) +++ head/sys/nfsclient/nfs.h Thu Nov 13 11:35:18 2008 (r184920) @@ -40,6 +40,10 @@ #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 Thu Nov 13 11:07:17 2008 (r184919) +++ head/sys/nfsserver/nfs.h Thu Nov 13 11:35:18 2008 (r184920) @@ -40,6 +40,10 @@ #include "opt_nfs.h" #endif +#if !defined(NFS_NEWRPC) && !defined(NFS_LEGACYRPC) +#define NFS_LEGACYRPC +#endif + /* * Tunable constants for nfs */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811131135.mADBZIbU058019>