summary refs log tree commit diff
path: root/fs/ext4
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 /fs/ext4
parent8a98ec7c7b3901330a036af0f62f523c31d763da (diff)
downloadlinux-6fd941784b8ac3e74313f7112f0586076dc36544.tar.gz
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>
Diffstat (limited to 'fs/ext4')
-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)
 		error = __ext4_set_acl(handle, inode, ACL_TYPE_DEFAULT,
 				       default_acl, XATTR_CREATE);
 		posix_acl_release(default_acl);
+	} else {
+		inode->i_default_acl = NULL;
 	}
 	if (acl) {
 		if (!error)
 			error = __ext4_set_acl(handle, inode, ACL_TYPE_ACCESS,
 					       acl, XATTR_CREATE);
 		posix_acl_release(acl);
+	} else {
+		inode->i_acl = NULL;
 	}
 	return error;
 }