Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / fs / jfs / acl.c

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index e0b6fdab200ce1c34d55d9e914e8b082ed966fd7..e2281300979c7b2c5e09287e28364bb25733c648 100644 (file)
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -183,6 +183,9 @@ cleanup:
                posix_acl_release(acl);
        } else
                inode->i_mode &= ~current->fs->umask;
+       
+       JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |
+                              inode->i_mode;
 
        return rc;
 }