[Devil-linux-commit] build/scripts/config/linux-2.6 config_linux.nfsd, 1.4, 1.5 config_linux.nfs, 1.4, 1.5

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/config/linux-2.6
In directory vz-cvs-3.sog:/tmp/cvs-serv16294

Modified Files:
	config_linux.nfsd config_linux.nfs 
Log Message:

- fixed kernel part of NFS service


Index: config_linux.nfsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux.nfsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config_linux.nfsd	7 Jan 2009 06:34:58 -0000	1.4
+++ config_linux.nfsd	20 Jul 2011 19:44:27 -0000	1.5
@@ -1,12 +1,11 @@
 CONFIG_NFSD=y
+CONFIG_NFSD_DEPRECATED=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y

Index: config_linux.nfs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux.nfs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config_linux.nfs	7 Jan 2009 06:34:57 -0000	1.4
+++ config_linux.nfs	20 Jul 2011 19:44:27 -0000	1.5
@@ -1,8 +1,12 @@
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
+# CONFIG_NFS_V4_1 is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=y
@@ -11,4 +15,3 @@
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
-