diff options
Diffstat (limited to 'fs/9p/acl.c')
-rw-r--r-- | fs/9p/acl.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c index 5b91689ac0b1..7af425f53bee 100644 --- a/fs/9p/acl.c +++ b/fs/9p/acl.c | |||
@@ -166,16 +166,13 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid) | |||
166 | return retval; | 166 | return retval; |
167 | } | 167 | } |
168 | 168 | ||
169 | int v9fs_set_create_acl(struct dentry *dentry, | 169 | int v9fs_set_create_acl(struct inode *inode, struct p9_fid *fid, |
170 | struct posix_acl *dacl, struct posix_acl *acl) | 170 | struct posix_acl *dacl, struct posix_acl *acl) |
171 | { | 171 | { |
172 | struct p9_fid *fid = v9fs_fid_lookup(dentry); | 172 | set_cached_acl(inode, ACL_TYPE_DEFAULT, dacl); |
173 | set_cached_acl(dentry->d_inode, ACL_TYPE_DEFAULT, dacl); | 173 | set_cached_acl(inode, ACL_TYPE_ACCESS, acl); |
174 | set_cached_acl(dentry->d_inode, ACL_TYPE_ACCESS, acl); | 174 | v9fs_set_acl(fid, ACL_TYPE_DEFAULT, dacl); |
175 | if (!IS_ERR(fid)) { | 175 | v9fs_set_acl(fid, ACL_TYPE_ACCESS, acl); |
176 | v9fs_set_acl(fid, ACL_TYPE_DEFAULT, dacl); | ||
177 | v9fs_set_acl(fid, ACL_TYPE_ACCESS, acl); | ||
178 | } | ||
179 | return 0; | 176 | return 0; |
180 | } | 177 | } |
181 | 178 | ||