Commit bc9ff117 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

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

parent b59e9ac5
...@@ -576,6 +576,12 @@ CONFIG_NFSD_V3 ...@@ -576,6 +576,12 @@ CONFIG_NFSD_V3
If you would like to include the NFSv3 server as well as the NFSv2 If you would like to include the NFSv3 server as well as the NFSv2
server, say Y here. If unsure, say Y. 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 CONFIG_NFSD_TCP
Enable NFS service over TCP connections. This the officially Enable NFS service over TCP connections. This the officially
still experimental, but seems to work well. still experimental, but seems to work well.
......
...@@ -121,6 +121,7 @@ if [ "$CONFIG_NET" = "y" ]; then ...@@ -121,6 +121,7 @@ if [ "$CONFIG_NET" = "y" ]; then
dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET
dep_mbool ' Provide NFSv3 server support' CONFIG_NFSD_V3 $CONFIG_NFSD 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 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 if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then
......
...@@ -7,6 +7,7 @@ obj-$(CONFIG_NFSD) += nfsd.o ...@@ -7,6 +7,7 @@ obj-$(CONFIG_NFSD) += nfsd.o
nfsd-y := nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.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 export.o auth.o lockd.o nfscache.o nfsxdr.o stats.o
nfsd-$(CONFIG_NFSD_V3) += nfs3proc.o nfs3xdr.o nfsd-$(CONFIG_NFSD_V3) += nfs3proc.o nfs3xdr.o
nfsd-$(CONFIG_NFSD_V4) += nfs4proc.o nfs4xdr.o
nfsd-objs := $(nfsd-y) nfsd-objs := $(nfsd-y)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment