summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerie Aurora <val@vaaconsulting.com>2013-01-07 05:38:44 +0100
committerTheodore Ts'o <tytso@mit.edu>2013-01-07 05:38:44 +0100
commit96465efee14ecca0cdffcb09f9903635db8fc504 (patch)
tree82b6ad8084cc97422fa7ebab015059a3a135209f
parentLinux 3.8-rc2 (diff)
downloadlinux-96465efee14ecca0cdffcb09f9903635db8fc504.tar.xz
linux-96465efee14ecca0cdffcb09f9903635db8fc504.zip
ext4: fix configuration dependencies for ext4 ACLs and security labels
Commit "ext4: Remove CONFIG_EXT4_FS_XATTR" removed the configuration dependencies for ext4 xattrs from the ext4 ACLs and security labels configuration options, but did not replace them with a dependency on ext4 itself. Add back the dependency on ext4 so the options only show up if ext4 is enabled. Signed-off-by: Valerie Aurora <val@vaaconsulting.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Reviewed-by: Tao Ma <boyu.mt@taobao.com>
-rw-r--r--fs/ext4/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index 0a475c881852..987358740cb9 100644
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -41,6 +41,7 @@ config EXT4_USE_FOR_EXT23
config EXT4_FS_POSIX_ACL
bool "Ext4 POSIX Access Control Lists"
+ depends on EXT4_FS
select FS_POSIX_ACL
help
POSIX Access Control Lists (ACLs) support permissions for users and
@@ -53,6 +54,7 @@ config EXT4_FS_POSIX_ACL
config EXT4_FS_SECURITY
bool "Ext4 Security Labels"
+ depends on EXT4_FS
help
Security labels support alternative access control models
implemented by security modules like SELinux. This option