diff options
Diffstat (limited to 'fs/f2fs/acl.c')
-rw-r--r-- | fs/f2fs/acl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c index 4320ffab3495..c5e4a1856a0f 100644 --- a/fs/f2fs/acl.c +++ b/fs/f2fs/acl.c | |||
@@ -214,12 +214,10 @@ static int __f2fs_set_acl(struct inode *inode, int type, | |||
214 | case ACL_TYPE_ACCESS: | 214 | case ACL_TYPE_ACCESS: |
215 | name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS; | 215 | name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS; |
216 | if (acl) { | 216 | if (acl) { |
217 | error = posix_acl_equiv_mode(acl, &inode->i_mode); | 217 | error = posix_acl_update_mode(inode, &inode->i_mode, &acl); |
218 | if (error < 0) | 218 | if (error) |
219 | return error; | 219 | return error; |
220 | set_acl_inode(fi, inode->i_mode); | 220 | set_acl_inode(fi, inode->i_mode); |
221 | if (error == 0) | ||
222 | acl = NULL; | ||
223 | } | 221 | } |
224 | break; | 222 | break; |
225 | 223 | ||