Patchwork ext4: fix configuration dependencies for ext4 ACLs and security labels

login
register
mail settings
Submitter Valerie Aurora
Date Jan. 6, 2013, 3:53 a.m.
Message ID <1357444389-4895-1-git-send-email-val@vaaconsulting.com>
Download mbox | patch
Permalink /patch/209724/
State Accepted
Headers show

Comments

Valerie Aurora - Jan. 6, 2013, 3:53 a.m.
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>
---
 fs/ext4/Kconfig |    2 ++
 1 file changed, 2 insertions(+)
Tao Ma - Jan. 6, 2013, 5:17 a.m.
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 <val@vaaconsulting.com>
Thanks.
Acked-by: Tao Ma <boyu.mt@taobao.com>

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

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o - Jan. 7, 2013, 4:07 a.m.
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 <val@vaaconsulting.com>

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

       	    		 	     	    	 - Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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