| Message ID | 20180831143352.22970-1-cgxu519@gmx.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v2,1/5] ext2: cache NULL when both default_acl and acl are NULL | expand |
On Fri 31-08-18 22:33:48, 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> Thanks! I'll take this patch (with slight changelog update) to my tree. Honza > --- > v1->v2: > - Coding style change. > > fs/ext2/acl.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c > index 224c04abb2e5..cf4c77f8dd08 100644 > --- a/fs/ext2/acl.c > +++ b/fs/ext2/acl.c > @@ -256,11 +256,15 @@ ext2_init_acl(struct inode *inode, struct inode *dir) > if (default_acl) { > error = __ext2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT); > posix_acl_release(default_acl); > + } else { > + inode->i_default_acl = NULL; > } > if (acl) { > if (!error) > error = __ext2_set_acl(inode, acl, ACL_TYPE_ACCESS); > posix_acl_release(acl); > + } else { > + inode->i_acl = NULL; > } > return error; > } > -- > 2.17.1 > >
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 224c04abb2e5..cf4c77f8dd08 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c @@ -256,11 +256,15 @@ ext2_init_acl(struct inode *inode, struct inode *dir) if (default_acl) { error = __ext2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT); posix_acl_release(default_acl); + } else { + inode->i_default_acl = NULL; } if (acl) { if (!error) error = __ext2_set_acl(inode, acl, ACL_TYPE_ACCESS); posix_acl_release(acl); + } else { + inode->i_acl = NULL; } return error; }
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> --- v1->v2: - Coding style change. fs/ext2/acl.c | 4 ++++ 1 file changed, 4 insertions(+)