xfs: fix small mismerge in xfs_vn_mknod

PATCH In review Christoph Hellwig 2 participants 2 messages Jun 12, 2009 XFS filesystem

lore

Share & tools

lore

Christoph Hellwig

author

2009-06-12 15:18 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

fs/xfs/linux-2.6/xfs_iops.c +2 -2

Index: xfs/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);

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Felix Blyakher

Reviewed-by on v1 1/1

2009-06-12 15:58 UTC #1 lore raw

Quoted 5 lines · Christoph Hellwig

Identation got messed up when merging the current_umask changes with the generic ACL support.
Signed-off-by Christoph Hellwig <[email protected]>

Reviewed-by Felix Blyakher <[email protected]>

Quoted 20 lines

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
fs/xfs/linux-2.6/xfs_iops.c +2 -2
@@ -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);

Quoted 4 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs