import PULS_20180308

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / f2fs / acl.c

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 44abc2f286e00ad4ecff03e0293f80ab8d3d19fd..9c4f3c732bce4a3a6773c848c1a05eb25c7cb1d1 100644 (file)
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -223,12 +223,10 @@ static int f2fs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
        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;