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.
This commit is contained in:
Doug Rabson 2008-11-13 11:35:18 +00:00
parent 9275b7fce8
commit 0eec5c87bf
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=184920
4 changed files with 13 additions and 4 deletions

View File

@ -2296,7 +2296,7 @@ nfsclient/krpc_subr.c optional bootp nfsclient
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

View File

@ -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

View File

@ -40,6 +40,10 @@
#include "opt_nfs.h"
#endif
#if !defined(NFS_NEWRPC) && !defined(NFS_LEGACYRPC)
#define NFS_LEGACYRPC
#endif
#include <nfsclient/nfsargs.h>
/*

View File

@ -40,6 +40,10 @@
#include "opt_nfs.h"
#endif
#if !defined(NFS_NEWRPC) && !defined(NFS_LEGACYRPC)
#define NFS_LEGACYRPC
#endif
/*
* Tunable constants for nfs
*/