aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-02-11 17:12:24 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-04-23 16:13:38 -0400
commit892069552eedfa0d2fca41680d076a5bc0a3c26e (patch)
treeace108ba5f5380f6173a1b0003445f7afb2b2e1c
parentd24455b5ffe02a652e8cb1ed2d3570a512c898f8 (diff)
NFSD: Move "select FS_POSIX_ACL if NFSD_V4"
Clean up: since FS_POSIX_ACL is a non-visible boolean entry, it can be selected safely under the NFSD_V4 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/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index a1dccb6a9c96..94250f0c0cc8 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -411,7 +411,7 @@ config JFS_STATISTICS
411 to be made available to the user in the /proc/fs/jfs/ directory. 411 to be made available to the user in the /proc/fs/jfs/ directory.
412 412
413config FS_POSIX_ACL 413config FS_POSIX_ACL
414# Posix ACL utility routines (for now, only ext2/ext3/jfs/reiserfs) 414# Posix ACL utility routines (for now, only ext2/ext3/jfs/reiserfs/nfs4)
415# 415#
416# NOTE: you can implement Posix ACLs without these helpers (XFS does). 416# NOTE: you can implement Posix ACLs without these helpers (XFS does).
417# Never use this symbol for ifdefs. 417# Never use this symbol for ifdefs.
@@ -1698,7 +1698,6 @@ config NFSD
1698 select NFS_ACL_SUPPORT if NFSD_V2_ACL 1698 select NFS_ACL_SUPPORT if NFSD_V2_ACL
1699 select CRYPTO_MD5 if NFSD_V4 1699 select CRYPTO_MD5 if NFSD_V4
1700 select CRYPTO if NFSD_V4 1700 select CRYPTO if NFSD_V4
1701 select FS_POSIX_ACL if NFSD_V4
1702 select PROC_FS if NFSD_V4 1701 select PROC_FS if NFSD_V4
1703 select PROC_FS if SUNRPC_GSS 1702 select PROC_FS if SUNRPC_GSS
1704 help 1703 help
@@ -1761,6 +1760,7 @@ config NFSD_V3_ACL
1761config NFSD_V4 1760config NFSD_V4
1762 bool "NFS server support for NFS version 4 (EXPERIMENTAL)" 1761 bool "NFS server support for NFS version 4 (EXPERIMENTAL)"
1763 depends on NFSD && NFSD_V3 && EXPERIMENTAL 1762 depends on NFSD && NFSD_V3 && EXPERIMENTAL
1763 select FS_POSIX_ACL
1764 select RPCSEC_GSS_KRB5 1764 select RPCSEC_GSS_KRB5
1765 help 1765 help
1766 This option enables support in your system's NFS server for 1766 This option enables support in your system's NFS server for