]> err.no Git - linux-2.6/commitdiff
NFSD: Move "select NFSD_V2_ACL if NFSD_V3_ACL"
authorChuck Lever <chuck.lever@oracle.com>
Mon, 11 Feb 2008 22:12:31 +0000 (17:12 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Wed, 23 Apr 2008 20:13:38 +0000 (16:13 -0400)
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>
fs/Kconfig

index 94250f0c0cc8eb6a9ebdd69fdee66dbcbcab6695..b609843f8d63a88abc43c5288c64c54444ac95a6 100644 (file)
@@ -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.