summaryrefslogtreecommitdiff
path: root/fs/orangefs/acl.c
diff options
context:
space:
mode:
authorChengguang Xu <cgxu519@gmx.com>2018-08-31 22:33:52 +0800
committerMike Marshall <hubcap@omnibond.com>2018-10-10 09:54:25 -0400
commit052d12766b7147500d9d5017bb90d4524f01e731 (patch)
tree789e2ca1f198b983c12905736763d731eba13d56 /fs/orangefs/acl.c
parent0238df646e6224016a45505d2c111a24669ebe21 (diff)
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>
Diffstat (limited to 'fs/orangefs/acl.c')
-rw-r--r--fs/orangefs/acl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/orangefs/acl.c b/fs/orangefs/acl.c
index 10587413b20e..72d2ff17d27b 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 */