From: Chengguang Xu Date: Fri, 31 Aug 2018 14:33:52 +0000 (+0800) Subject: orangefs: cache NULL when both default_acl and acl are NULL X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=052d12766b7147500d9d5017bb90d4524f01e731;p=linux.git 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 Signed-off-by: Mike Marshall --- diff --git a/fs/orangefs/acl.c b/fs/orangefs/acl.c index 10587413b20e4..72d2ff17d27b3 100644 --- a/fs/orangefs/acl.c +++ b/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, ACL_TYPE_DEFAULT); posix_acl_release(default_acl); + } else { + inode->i_default_acl = NULL; } if (acl) { if (!error) error = __orangefs_set_acl(inode, acl, ACL_TYPE_ACCESS); posix_acl_release(acl); + } else { + inode->i_acl = NULL; } /* If mode of the inode was changed, then do a forcible ->setattr */