Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs

[mv-sheeva.git] / fs / xfs / linux-2.6 / xfs_iops.c

diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 84e391ab70b07fdfcbebdf2414c061880ccb4af5..800dd4f98d4edd652f8352c7b1b34eb6bbd26d35 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -225,8 +225,8 @@ xfs_vn_mknod(
                if (IS_ERR(default_acl))
                        return -PTR_ERR(default_acl);
 
-               if (!default_acl)
-                       mode &= ~current->fs->umask;
+       if (!default_acl)
+               mode &= ~current_umask();
        }
 
        xfs_dentry_to_name(&name, dentry);
@@ -400,7 +400,7 @@ xfs_vn_symlink(
        mode_t          mode;
 
        mode = S_IFLNK |
-               (irix_symlink_mode ? 0777 & ~current->fs->umask : S_IRWXUGO);
+               (irix_symlink_mode ? 0777 & ~current_umask() : S_IRWXUGO);
        xfs_dentry_to_name(&name, dentry);
 
        error = xfs_symlink(XFS_I(dir), &name, symname, mode, &cip, NULL);