summaryrefslogtreecommitdiffstats
path: root/kernel/fs/f2fs/acl.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fs/f2fs/acl.c')
-rw-r--r--kernel/fs/f2fs/acl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/fs/f2fs/acl.c b/kernel/fs/f2fs/acl.c
index c8f25f724..e9a8d676c 100644
--- a/kernel/fs/f2fs/acl.c
+++ b/kernel/fs/f2fs/acl.c
@@ -214,12 +214,10 @@ static int __f2fs_set_acl(struct inode *inode, int type,
case ACL_TYPE_ACCESS:
name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS;
if (acl) {
- error = posix_acl_equiv_mode(acl, &inode->i_mode);
- if (error < 0)
+ error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+ if (error)
return error;
set_acl_inode(fi, inode->i_mode);
- if (error == 0)
- acl = NULL;
}
break;