[PATCH] kNFSd: Enable selection of NFSv4 server in configurator and Makefile

diff --git a/fs/Config.help b/fs/Config.help
index d84c6ff0fb0ef02915b107d601594923e0411479..44622847c4dfc943dd32d5abe8804624d59a42be 100644 (file)
--- a/fs/Config.help
+++ b/fs/Config.help
@@ -576,6 +576,12 @@ CONFIG_NFSD_V3
   If you would like to include the NFSv3 server as well as the NFSv2
   server, say Y here.  If unsure, say Y.
 
+CONFIG_NFSD_V4
+  If you would like to include the NFSv4 server as well as the NFSv2
+  and NFSv3 servers, say Y here.  This feature is experimental, and
+  should only be used if you are interested in helping to test NFSv4.
+  If unsure, say N.
+
 CONFIG_NFSD_TCP
   Enable NFS service over TCP connections.  This the officially
   still experimental, but seems to work well.

diff --git a/fs/Config.in b/fs/Config.in
index 2dde840a1d0265fe60b64eb3547fe865935003df..e6eb844338ecae278d10b8baa5b620db864e80c3 100644 (file)
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -121,6 +121,7 @@ if [ "$CONFIG_NET" = "y" ]; then
 
    dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET
    dep_mbool '  Provide NFSv3 server support' CONFIG_NFSD_V3 $CONFIG_NFSD
+   dep_mbool '  Provide NFSv4 server support (EXPERIMENTAL)' CONFIG_NFSD_V4 $CONFIG_NFSD_V3 $CONFIG_EXPERIMENTAL
    dep_mbool '  Provide NFS server over TCP support (EXPERIMENTAL)' CONFIG_NFSD_TCP $CONFIG_NFSD $CONFIG_EXPERIMENTAL
 
    if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then

diff --git a/fs/nfsd/Makefile b/fs/nfsd/Makefile
index c7ddb3601d2eb2994e59007ae3b3043e7925f40e..601d1640fa9c852c54b3daaf49152479ae041f30 100644 (file)
--- a/fs/nfsd/Makefile
+++ b/fs/nfsd/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_NFSD)      += nfsd.o
 nfsd-y                         := nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
                           export.o auth.o lockd.o nfscache.o nfsxdr.o stats.o
 nfsd-$(CONFIG_NFSD_V3) += nfs3proc.o nfs3xdr.o
+nfsd-$(CONFIG_NFSD_V4) += nfs4proc.o nfs4xdr.o
 nfsd-objs              := $(nfsd-y)
 
 include $(TOPDIR)/Rules.make