Commit f05e15b5 authored by Herbert Xu's avatar Herbert Xu Committed by Linus Torvalds
Browse files

[PATCH] nfsd kconfig: select things at the closest tristate instead of bool 



I noticed recently that my CONFIG_CRYPTO_MD5 turned into a y again instead
of m.  It turns out that CONFIG_NFSD_V4 is selecting it to be y even though
I've chosen to compile nfsd as a module.

In general when we have a bool sitting under a tristate it is better to
select things you need from the tristate rather than the bool since that
allows the things you select to be modules.

The following patch does it for nfsd.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5024ad4a

fs/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -1490,7 +1490,12 @@ config NFSD 
	select LOCKD

	select SUNRPC

	select EXPORTFS

	select NFS_ACL_SUPPORT if NFSD_V3_ACL || NFSD_V2_ACL

	select NFSD_V2_ACL if NFSD_V3_ACL

	select NFS_ACL_SUPPORT if NFSD_V2_ACL

	select NFSD_TCP if NFSD_V4

	select CRYPTO_MD5 if NFSD_V4

	select CRYPTO if NFSD_V4

	select FS_POSIX_ACL if NFSD_V4

	help

	  If you want your Linux box to act as an NFS *server*, so that other

	  computers on your local network which support NFS can access certain
@@ -1528,7 +1533,6 @@ config NFSD_V3 
config NFSD_V3_ACL

	bool "Provide server support for the NFSv3 ACL protocol extension"

	depends on NFSD_V3

	select NFSD_V2_ACL

	help

	  Implement the NFSv3 ACL protocol extension for manipulating POSIX

	  Access Control Lists on exported file systems. NFS clients should
@@ -1538,10 +1542,6 @@ config NFSD_V3_ACL 
config NFSD_V4

	bool "Provide NFSv4 server support (EXPERIMENTAL)"

	depends on NFSD_V3 && EXPERIMENTAL

	select NFSD_TCP

	select CRYPTO_MD5

	select CRYPTO

	select FS_POSIX_ACL

	help

	  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

CRA Git | Maintained and supported by SUSTech CRA and CCSE