2008-02-11 22:12:47

by Chuck Lever

[permalink] [raw]
Subject: [PATCH 08/11] 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 <[email protected]>
---

fs/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/Kconfig b/fs/Kconfig
index 9ee288f..e94ca09 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -411,7 +411,7 @@ config JFS_STATISTICS
to be made available to the user in the /proc/fs/jfs/ directory.

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).
# Never use this symbol for ifdefs.
@@ -1661,7 +1661,6 @@ config NFSD
select NFS_ACL_SUPPORT if NFSD_V2_ACL
select CRYPTO_MD5 if NFSD_V4
select CRYPTO if NFSD_V4
- select FS_POSIX_ACL if NFSD_V4
help
Choose Y here if you want to allow other computers to access
files residing on this system using Sun's Network File System
@@ -1722,6 +1721,7 @@ config NFSD_V3_ACL
config NFSD_V4
bool "NFS server support for NFS version 4 (EXPERIMENTAL)"
depends on NFSD && NFSD_V3 && PROC_FS && EXPERIMENTAL
+ select FS_POSIX_ACL
select RPCSEC_GSS_KRB5
help
This option enables support in your system's NFS server for