1 files changed, 4 insertions, 9 deletions

diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index d5e33a077a67..d0dddaceac59 100644
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -82,18 +82,14 @@ generic_acl_set(struct dentry *dentry, const char *name, const void *value,
                         return PTR_ERR(acl);
         }
         if (acl) {
-                mode_t mode;
-
                 error = posix_acl_valid(acl);
                 if (error)
                         goto failed;
                 switch (type) {
                 case ACL_TYPE_ACCESS:
-                        mode = inode->i_mode;
-                        error = posix_acl_equiv_mode(acl, &mode);
+                        error = posix_acl_equiv_mode(acl, &inode->i_mode);
                         if (error < 0)
                                 goto failed;
-                        inode->i_mode = mode;
                         inode->i_ctime = CURRENT_TIME;
                         if (error == 0) {
                                 posix_acl_release(acl);
@@ -125,21 +121,20 @@ int
 generic_acl_init(struct inode *inode, struct inode *dir)
 {
         struct posix_acl *acl = NULL;
-        mode_t mode = inode->i_mode;
         int error;
 
-        inode->i_mode = mode & ~current_umask();
         if (!S_ISLNK(inode->i_mode))
                 acl = get_cached_acl(dir, ACL_TYPE_DEFAULT);
         if (acl) {
                 if (S_ISDIR(inode->i_mode))
                         set_cached_acl(inode, ACL_TYPE_DEFAULT, acl);
-                error = posix_acl_create(&acl, GFP_KERNEL, &mode);
+                error = posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
                 if (error < 0)
                         return error;
-                inode->i_mode = mode;
                 if (error > 0)
                         set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
+        } else {
+                inode->i_mode &= ~current_umask();
         }
         error = 0;