Browse Source

[PATCH] acl kconfig cleanup

Original patch from Matt Mackall <mpm@selenic.com>

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andreas Gruenbacher 20 years ago
parent
commit
b84c21572d
1 changed files with 6 additions and 2 deletions
  1. 6 2
      fs/Kconfig

+ 6 - 2
fs/Kconfig

@@ -29,6 +29,7 @@ config EXT2_FS_XATTR
 config EXT2_FS_POSIX_ACL
 config EXT2_FS_POSIX_ACL
 	bool "Ext2 POSIX Access Control Lists"
 	bool "Ext2 POSIX Access Control Lists"
 	depends on EXT2_FS_XATTR
 	depends on EXT2_FS_XATTR
+	select FS_POSIX_ACL
 	help
 	help
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  groups beyond the owner/group/world scheme.
 	  groups beyond the owner/group/world scheme.
@@ -114,6 +115,7 @@ config EXT3_FS_XATTR
 config EXT3_FS_POSIX_ACL
 config EXT3_FS_POSIX_ACL
 	bool "Ext3 POSIX Access Control Lists"
 	bool "Ext3 POSIX Access Control Lists"
 	depends on EXT3_FS_XATTR
 	depends on EXT3_FS_XATTR
+	select FS_POSIX_ACL
 	help
 	help
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  groups beyond the owner/group/world scheme.
 	  groups beyond the owner/group/world scheme.
@@ -241,6 +243,7 @@ config REISERFS_FS_XATTR
 config REISERFS_FS_POSIX_ACL
 config REISERFS_FS_POSIX_ACL
 	bool "ReiserFS POSIX Access Control Lists"
 	bool "ReiserFS POSIX Access Control Lists"
 	depends on REISERFS_FS_XATTR
 	depends on REISERFS_FS_XATTR
+	select FS_POSIX_ACL
 	help
 	help
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  groups beyond the owner/group/world scheme.
 	  groups beyond the owner/group/world scheme.
@@ -274,6 +277,7 @@ config JFS_FS
 config JFS_POSIX_ACL
 config JFS_POSIX_ACL
 	bool "JFS POSIX Access Control Lists"
 	bool "JFS POSIX Access Control Lists"
 	depends on JFS_FS
 	depends on JFS_FS
+	select FS_POSIX_ACL
 	help
 	help
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  Posix Access Control Lists (ACLs) support permissions for users and
 	  groups beyond the owner/group/world scheme.
 	  groups beyond the owner/group/world scheme.
@@ -318,8 +322,7 @@ config FS_POSIX_ACL
 # 	Never use this symbol for ifdefs.
 # 	Never use this symbol for ifdefs.
 #
 #
 	bool
 	bool
-	depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL || REISERFS_FS_POSIX_ACL || NFSD_V4
-	default y
+	default n
 
 
 source "fs/xfs/Kconfig"
 source "fs/xfs/Kconfig"
 
 
@@ -1438,6 +1441,7 @@ config NFSD_V4
 	select NFSD_TCP
 	select NFSD_TCP
 	select CRYPTO_MD5
 	select CRYPTO_MD5
 	select CRYPTO
 	select CRYPTO
+	select FS_POSIX_ACL
 	help
 	help
 	  If you would like to include the NFSv4 server as well as the NFSv2
 	  If you would like to include the NFSv4 server as well as the NFSv2
 	  and NFSv3 servers, say Y here.  This feature is experimental, and
 	  and NFSv3 servers, say Y here.  This feature is experimental, and