Commit 96465efe authored by Valerie Aurora's avatar Valerie Aurora Committed by Theodore Ts'o
Browse files

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: default avatarValerie Aurora <val@vaaconsulting.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: default avatarTao Ma <boyu.mt@taobao.com>
parent d1c3ed66

fs/ext4/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ config EXT4_USE_FOR_EXT23 




config EXT4_FS_POSIX_ACL

config EXT4_FS_POSIX_ACL

	bool "Ext4 POSIX Access Control Lists"

	bool "Ext4 POSIX Access Control Lists"

	depends on EXT4_FS

	select FS_POSIX_ACL

	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
@@ -53,6 +54,7 @@ config EXT4_FS_POSIX_ACL 




config EXT4_FS_SECURITY

config EXT4_FS_SECURITY

	bool "Ext4 Security Labels"

	bool "Ext4 Security Labels"

	depends on EXT4_FS

	help

	help

	  Security labels support alternative access control models

	  Security labels support alternative access control models

	  implemented by security modules like SELinux.  This option

	  implemented by security modules like SELinux.  This option