2013-01-06 04:09:29

by Valerie Aurora

Subject: [PATCH] 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 <[email protected]>
---
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
--
1.7.10.4

2013-01-06 05:24:29

by Tao Ma

Subject: Re: [PATCH] ext4: fix configuration dependencies for ext4 ACLs and security labels

On 01/06/2013 11:53 AM, Valerie Aurora wrote:
> 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 <[email protected]>
Thanks.
Acked-by: Tao Ma <[email protected]>

> ---
> 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
>

2013-01-07 04:07:59

by Theodore Ts'o

Subject: Re: [PATCH] ext4: fix configuration dependencies for ext4 ACLs and security labels

On Sat, Jan 05, 2013 at 07:53:09PM -0800, Valerie Aurora wrote:
> 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 <[email protected]>

Thanks Val, for catching this! I've queued this on the ext4 tree.

- Ted