From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 11 Feb 2008 22:12:31 +0000 (-0500)
Subject: NFSD: Move "select NFSD_V2_ACL if NFSD_V3_ACL"
X-Git-Tag: v2.6.26-rc1~1083^2~37
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=78dd0992a3462e05138cf4d08df759bf1c7a08c9;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/Kconfig b/fs/Kconfig
index 94250f0c0cc..b609843f8d6 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.