summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-02-11 17:12:31 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-04-23 16:13:38 -0400
commit78dd0992a3462e05138cf4d08df759bf1c7a08c9 (patch)
treeadec5e8e0c1d7cc732eefda84cb7a33235588dbd
parent892069552eedfa0d2fca41680d076a5bc0a3c26e (diff)
downloadlinux-stable-78dd0992a3462e05138cf4d08df759bf1c7a08c9.tar.gz
linux-stable-78dd0992a3462e05138cf4d08df759bf1c7a08c9.tar.bz2
linux-stable-78dd0992a3462e05138cf4d08df759bf1c7a08c9.zip
NFSD: Move "select NFSD_V2_ACL if NFSD_V3_ACL"
Clean up: since NFSD_V2_ACL is a boolean, it can be selected safely under the NFSD_V3_ACL entry (also a boolean). Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 94250f0c0cc8..b609843f8d63 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1694,7 +1694,6 @@ config NFSD
select LOCKD
select SUNRPC
select EXPORTFS
- select NFSD_V2_ACL if NFSD_V3_ACL
select NFS_ACL_SUPPORT if NFSD_V2_ACL
select CRYPTO_MD5 if NFSD_V4
select CRYPTO if NFSD_V4
@@ -1738,6 +1737,7 @@ config NFSD_V3
config NFSD_V3_ACL
bool "NFS server support for the NFSv3 ACL protocol extension"
depends on NFSD_V3
+ select NFSD_V2_ACL
help
Solaris NFS servers support an auxiliary NFSv3 ACL protocol that
never became an official part of the NFS version 3 protocol.