summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2009-06-12 11:19:11 -0400
committerFelix Blyakher <felixb@sgi.com>2009-06-12 21:15:31 -0500
commite83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 (patch)
tree24e6783973cb580a1074c4689b4978bff29c2167 /fs
parent493b87e5ed352cf548e6456ddfc36576e28278ea (diff)
xfs: fix small mismerge in xfs_vn_mknod
Identation got messed up when merging the current_umask changes with the generic ACL support. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Felix Blyakher <felixb@sgi.com> Signed-off-by: Felix Blyakher <felixb@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/linux-2.6/xfs_iops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 800dd4f98d4e..58973bb46038 100644
--- 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_umask();
+ if (!default_acl)
+ mode &= ~current_umask();
}
xfs_dentry_to_name(&name, dentry);