aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChengguang Xu <cgxu519@gmx.com>2018-10-06 22:40:34 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-10-06 22:40:34 -0400
commit6fd941784b8ac3e74313f7112f0586076dc36544 (patch)
tree9868e0e24c6fc12c560ff33e993f2c11250c6abd
parent8a98ec7c7b3901330a036af0f62f523c31d763da (diff)
ext4: 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 attempt. Signed-off-by: Chengguang Xu <cgxu519@gmx.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/ext4/acl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index fb50f9aa6ead..c1d570ee1d9f 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -284,12 +284,16 @@ ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
284 error = __ext4_set_acl(handle, inode, ACL_TYPE_DEFAULT, 284 error = __ext4_set_acl(handle, inode, ACL_TYPE_DEFAULT,
285 default_acl, XATTR_CREATE); 285 default_acl, XATTR_CREATE);
286 posix_acl_release(default_acl); 286 posix_acl_release(default_acl);
287 } else {
288 inode->i_default_acl = NULL;
287 } 289 }
288 if (acl) { 290 if (acl) {
289 if (!error) 291 if (!error)
290 error = __ext4_set_acl(handle, inode, ACL_TYPE_ACCESS, 292 error = __ext4_set_acl(handle, inode, ACL_TYPE_ACCESS,
291 acl, XATTR_CREATE); 293 acl, XATTR_CREATE);
292 posix_acl_release(acl); 294 posix_acl_release(acl);
295 } else {
296 inode->i_acl = NULL;
293 } 297 }
294 return error; 298 return error;
295} 299}