summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorNeil Brown <neilb@cse.unsw.edu.au>2002-10-11 05:34:48 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-10-11 05:34:48 -0700
commitbc9ff117c1bc6a879fced39d09fae033d21b7d67 (patch)
tree400807b487eee59c05c66d182c8180f12e9ce4b2 /fs
parentb59e9ac5ec332ba084b44553ab1bd47e1ac30e41 (diff)
[PATCH] kNFSd: Enable selection of NFSv4 server in configurator and Makefile
Diffstat (limited to 'fs')
-rw-r--r--fs/Config.help6
-rw-r--r--fs/Config.in1
-rw-r--r--fs/nfsd/Makefile1
3 files changed, 8 insertions, 0 deletions
diff --git a/fs/Config.help b/fs/Config.help
index d84c6ff0fb0e..44622847c4df 100644
--- 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 2dde840a1d02..e6eb844338ec 100644
--- 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 c7ddb3601d2e..601d1640fa9c 100644
--- 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