Commit 89206955 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent d24455b5
...@@ -411,7 +411,7 @@ config JFS_STATISTICS ...@@ -411,7 +411,7 @@ config JFS_STATISTICS
to be made available to the user in the /proc/fs/jfs/ directory. to be made available to the user in the /proc/fs/jfs/ directory.
config FS_POSIX_ACL config FS_POSIX_ACL
# Posix ACL utility routines (for now, only ext2/ext3/jfs/reiserfs) # Posix ACL utility routines (for now, only ext2/ext3/jfs/reiserfs/nfs4)
# #
# NOTE: you can implement Posix ACLs without these helpers (XFS does). # NOTE: you can implement Posix ACLs without these helpers (XFS does).
# Never use this symbol for ifdefs. # Never use this symbol for ifdefs.
...@@ -1698,7 +1698,6 @@ config NFSD ...@@ -1698,7 +1698,6 @@ config NFSD
select NFS_ACL_SUPPORT if NFSD_V2_ACL select NFS_ACL_SUPPORT if NFSD_V2_ACL
select CRYPTO_MD5 if NFSD_V4 select CRYPTO_MD5 if NFSD_V4
select CRYPTO if NFSD_V4 select CRYPTO if NFSD_V4
select FS_POSIX_ACL if NFSD_V4
select PROC_FS if NFSD_V4 select PROC_FS if NFSD_V4
select PROC_FS if SUNRPC_GSS select PROC_FS if SUNRPC_GSS
help help
...@@ -1761,6 +1760,7 @@ config NFSD_V3_ACL ...@@ -1761,6 +1760,7 @@ config NFSD_V3_ACL
config NFSD_V4 config NFSD_V4
bool "NFS server support for NFS version 4 (EXPERIMENTAL)" bool "NFS server support for NFS version 4 (EXPERIMENTAL)"
depends on NFSD && NFSD_V3 && EXPERIMENTAL depends on NFSD && NFSD_V3 && EXPERIMENTAL
select FS_POSIX_ACL
select RPCSEC_GSS_KRB5 select RPCSEC_GSS_KRB5
help help
This option enables support in your system's NFS server for This option enables support in your system's NFS server for
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment