Commit f5f18647 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: properly apply umask when ACL is enabled



when ACL is enabled, posix_acl_create() may change inode's mode

Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
parent 5aaa432a
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -172,14 +172,24 @@ out:
int ceph_init_acl(struct dentry *dentry, struct inode *inode, struct inode *dir)
{
	struct posix_acl *default_acl, *acl;
	umode_t new_mode = inode->i_mode;
	int error;

	error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
	error = posix_acl_create(dir, &new_mode, &default_acl, &acl);
	if (error)
		return error;

	if (!default_acl && !acl)
	if (!default_acl && !acl) {
		cache_no_acl(inode);
		if (new_mode != inode->i_mode) {
			struct iattr newattrs = {
				.ia_mode = new_mode,
				.ia_valid = ATTR_MODE,
			};
			error = ceph_setattr(dentry, &newattrs);
		}
		return error;
	}

	if (default_acl) {
		error = ceph_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);