[PATCH] xfs: fix small mismerge in xfs_vn_mknod

Christoph Hellwig hch at infradead.org
Fri Jun 12 10:19:11 CDT 2009


Identation got messed up when merging the current_umask changes with
the generic ACL support.


Signed-off-by: Christoph Hellwig <hch at lst.de>

Index: xfs/fs/xfs/linux-2.6/xfs_iops.c
===================================================================
--- xfs.orig/fs/xfs/linux-2.6/xfs_iops.c	2009-06-12 17:16:26.902939418 +0200
+++ xfs/fs/xfs/linux-2.6/xfs_iops.c	2009-06-12 17:16:48.611940327 +0200
@@ -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);




More information about the xfs mailing list