浏览代码

orangefs: 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.
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>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Chengguang Xu 7 年之前
父节点
当前提交
052d12766b
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      fs/orangefs/acl.c

+ 4 - 0
fs/orangefs/acl.c

@@ -167,12 +167,16 @@ int orangefs_init_acl(struct inode *inode, struct inode *dir)
 		error = __orangefs_set_acl(inode, default_acl,
 		error = __orangefs_set_acl(inode, default_acl,
 					   ACL_TYPE_DEFAULT);
 					   ACL_TYPE_DEFAULT);
 		posix_acl_release(default_acl);
 		posix_acl_release(default_acl);
+	} else {
+		inode->i_default_acl = NULL;
 	}
 	}
 
 
 	if (acl) {
 	if (acl) {
 		if (!error)
 		if (!error)
 			error = __orangefs_set_acl(inode, acl, ACL_TYPE_ACCESS);
 			error = __orangefs_set_acl(inode, acl, ACL_TYPE_ACCESS);
 		posix_acl_release(acl);
 		posix_acl_release(acl);
+	} else {
+		inode->i_acl = NULL;
 	}
 	}
 
 
 	/* If mode of the inode was changed, then do a forcible ->setattr */
 	/* If mode of the inode was changed, then do a forcible ->setattr */