Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / fs / jfs / acl.c

diff --git a/kernel/fs/jfs/acl.c b/kernel/fs/jfs/acl.c
index 0c8ca83..9fad9f4 100644 (file)
--- a/kernel/fs/jfs/acl.c
+++ b/kernel/fs/jfs/acl.c
@@ -84,13 +84,11 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
        case ACL_TYPE_ACCESS:
                ea_name = POSIX_ACL_XATTR_ACCESS;
                if (acl) {
-                       rc = posix_acl_equiv_mode(acl, &inode->i_mode);
-                       if (rc < 0)
+                       rc = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+                       if (rc)
                                return rc;
                        inode->i_ctime = CURRENT_TIME;
                        mark_inode_dirty(inode);
-                       if (rc == 0)
-                               acl = NULL;
                }
                break;
        case ACL_TYPE_DEFAULT: