From patchwork Sun Jan 6 03:53:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: ext4: fix configuration dependencies for ext4 ACLs and security labels From: Valerie Aurora X-Patchwork-Id: 209724 Message-Id: <1357444389-4895-1-git-send-email-val@vaaconsulting.com> To: linux-ext4@vger.kernel.org Cc: Valerie Aurora , "Theodore Ts'o" , David Brown , Eric Sandeen , Jan Kara , Tao Ma Date: Sat, 5 Jan 2013 19:53:09 -0800 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 Acked-by: Tao Ma --- fs/ext4/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 0a475c8..9873587 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