diff options
| author | Chengguang Xu <cgxu519@gmx.com> | 2018-08-31 16:33:48 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2018-09-03 11:05:03 +0200 |
| commit | 59fed3bf8a461ab07a8e57b42b6402e984c7cc62 (patch) | |
| tree | b331155ab43493a904f0ff164430cc0416ee506f /fs/ext2 | |
| parent | udf: remove unused variables group_start and nr_groups (diff) | |
| download | linux-59fed3bf8a461ab07a8e57b42b6402e984c7cc62.tar.xz linux-59fed3bf8a461ab07a8e57b42b6402e984c7cc62.zip | |
ext2: cache NULL when both default_acl and acl are NULL
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. However,
when default_acl and acl are NULL, then they keep the value of
ACL_NOT_CACHED. This patch changes the code to cache NULL for acl /
default_acl in this case to save unnecessary ACL lookup in future.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/acl.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |