From: Christoph Hellwig <hch@infradead.org>
Date: Fri, 12 Jun 2009 15:19:11 +0000 (-0400)
Subject: xfs: fix small mismerge in xfs_vn_mknod
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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>
---

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);