1 files changed, 4 insertions, 5 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 595522022aca..c9d48dc78495 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -922,11 +922,10 @@ int simple_set_acl(struct inode *inode, struct posix_acl *acl, int type)
        int error;
        if (type == ACL_TYPE_ACCESS) {
-                error = posix_acl_equiv_mode(acl, &inode->i_mode);
+                error = posix_acl_update_mode(inode,
-                if (error < 0)
+                                &inode->i_mode, &acl);
-                        return 0;
+                if (error)
-                if (error == 0)
+                        return error;
-                        acl = NULL;
        }
        inode->i_ctime = current_time(inode);

diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 595522022aca..c9d48dc78495 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c
@@ -922,11 +922,10 @@ int simple_set_acl(struct inode inode, struct posix_acl acl, int type)
922	int error;	922	int error;
923		923
924	if (type == ACL_TYPE_ACCESS) {	924	if (type == ACL_TYPE_ACCESS) {
925	error = posix_acl_equiv_mode(acl, &inode->i_mode);	925	error = posix_acl_update_mode(inode,
926	if (error < 0)	926	&inode->i_mode, &acl);
927	return 0;	927	if (error)
928	if (error == 0)	928	return error;
929	acl = NULL;
930	}	929	}
931		930
932	inode->i_ctime = current_time(inode);	931	inode->i_ctime = current_time(inode);