[1/5] ext2: cache NULL when both default_acl and acl are NULL

Message ID 20180814141634.5471-1-cgxu519@gmx.com
State Superseded
Headers show
Series
  • [1/5] ext2: cache NULL when both default_acl and acl are NULL
Related show

Commit Message

cgxu519 Aug. 14, 2018, 2:16 p.m.
default_acl and acl of newly created inode will be initiated
as ACL_NOT_CACHED in vfs function inode_init_always() and later
will be updated by calling xxx_init_acl() in specific filesystems.
Howerver, when default_acl and acl are NULL then they keep the value
of ACL_NOT_CACHED, this patch tries to cache NULL for acl/default_acl
in this case.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
---
 fs/ext2/acl.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Jan Kara Aug. 29, 2018, 1:18 p.m. | #1
On Tue 14-08-18 22:16:30, Chengguang Xu wrote:
> default_acl and acl of newly created inode will be initiated
> as ACL_NOT_CACHED in vfs function inode_init_always() and later
> will be updated by calling xxx_init_acl() in specific filesystems.
> Howerver, when default_acl and acl are NULL then they keep the value
> of ACL_NOT_CACHED, this patch tries to cache NULL for acl/default_acl
> in this case.
> 
> Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
> ---
>  fs/ext2/acl.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
> index 224c04abb2e5..74411e8ea507 100644
> --- a/fs/ext2/acl.c
> +++ b/fs/ext2/acl.c
> @@ -262,5 +262,8 @@ ext2_init_acl(struct inode *inode, struct inode *dir)
>  			error = __ext2_set_acl(inode, acl, ACL_TYPE_ACCESS);
>  		posix_acl_release(acl);
>  	}
> +	if (!default_acl && !acl)
> +		cache_no_acl(inode);
> +

Thanks for the patch. I'd somewhat prefer something equivalent to:

	if (!acl)
		inode->i_acl = NULL;
	if (!default_acl)
		inode->i_default_acl = NULL;

given the code in ext2_init_acl(). It would be most natural like:

	if (default_acl) {
		do foo
	} else {
		inode->i_default_acl = NULL;
	}

And similarly for 'acl'.

								Honza

Patch

diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index 224c04abb2e5..74411e8ea507 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -262,5 +262,8 @@  ext2_init_acl(struct inode *inode, struct inode *dir)
 			error = __ext2_set_acl(inode, acl, ACL_TYPE_ACCESS);
 		posix_acl_release(acl);
 	}
+	if (!default_acl && !acl)
+		cache_no_acl(inode);
+
 	return error;
 }