aboutsummaryrefslogtreecommitdiffstats
path: root/fs/generic_acl.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/generic_acl.c')
-rw-r--r--fs/generic_acl.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index 3a60d9d1653c..134782116a62 100644
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -134,14 +134,8 @@ generic_acl_init(struct inode *inode, struct inode *dir)
134 if (acl) { 134 if (acl) {
135 struct posix_acl *clone; 135 struct posix_acl *clone;
136 136
137 if (S_ISDIR(inode->i_mode)) { 137 if (S_ISDIR(inode->i_mode))
138 clone = posix_acl_clone(acl, GFP_KERNEL); 138 set_cached_acl(inode, ACL_TYPE_DEFAULT, acl);
139 error = -ENOMEM;
140 if (!clone)
141 goto cleanup;
142 set_cached_acl(inode, ACL_TYPE_DEFAULT, clone);
143 posix_acl_release(clone);
144 }
145 clone = posix_acl_clone(acl, GFP_KERNEL); 139 clone = posix_acl_clone(acl, GFP_KERNEL);
146 error = -ENOMEM; 140 error = -ENOMEM;
147 if (!clone) 141 if (!clone)