From e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 12 Jun 2009 11:19:11 -0400 Subject: [PATCH] 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 Reviewed-by: Felix Blyakher Signed-off-by: Felix Blyakher --- fs/xfs/linux-2.6/xfs_iops.c | 4 ++-- 1 file 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 800dd4f98d4..58973bb4603 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); -- 2.20.1