diff --git a/[refs] b/[refs] index be104fb2d383..01e42ad0c01f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 493b87e5ed352cf548e6456ddfc36576e28278ea +refs/heads/master: e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 diff --git a/trunk/fs/xfs/linux-2.6/xfs_iops.c b/trunk/fs/xfs/linux-2.6/xfs_iops.c index 800dd4f98d4e..58973bb46038 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_iops.c +++ b/trunk/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_umask(); + if (!default_acl) + mode &= ~current_umask(); } xfs_dentry_to_name(&name, dentry);