Merge remote-tracking branch 'jk/vfs' into work.misc

2 files changed, 5 insertions, 9 deletions

diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index c6601a476c02..dfa519979038 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -193,15 +193,11 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type,
         case ACL_TYPE_ACCESS:
                 name_index = EXT4_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;
-                        else {
-                                inode->i_ctime = ext4_current_time(inode);
-                                ext4_mark_inode_dirty(handle, inode);
-                                if (error == 0)
-                                        acl = NULL;
-                        }
+                        inode->i_ctime = ext4_current_time(inode);
+                        ext4_mark_inode_dirty(handle, inode);
                 }
                 break;
 
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c6ea25a190f8..b27491e885c4 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5073,7 +5073,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
         int orphan = 0;
         const unsigned int ia_valid = attr->ia_valid;
 
-        error = inode_change_ok(inode, attr);
+        error = setattr_prepare(dentry, attr);
         if (error)
                 return error;