public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] xfs: fix small mismerge in xfs_vn_mknod
@ 2009-06-12 15:19 Christoph Hellwig
  2009-06-12 15:58 ` Felix Blyakher
  0 siblings, 1 reply; 2+ messages in thread
From: Christoph Hellwig @ 2009-06-12 15:19 UTC (permalink / raw)
  To: xfs

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


Signed-off-by: Christoph Hellwig <hch@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);

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] xfs: fix small mismerge in xfs_vn_mknod
  2009-06-12 15:19 [PATCH] xfs: fix small mismerge in xfs_vn_mknod Christoph Hellwig
@ 2009-06-12 15:58 ` Felix Blyakher
  0 siblings, 0 replies; 2+ messages in thread
From: Felix Blyakher @ 2009-06-12 15:58 UTC (permalink / raw)
  To: Christoph Hellwig; +Cc: xfs


On Jun 12, 2009, at 10:19 AM, Christoph Hellwig wrote:

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

>
>
> 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);
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-06-12 15:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-12 15:19 [PATCH] xfs: fix small mismerge in xfs_vn_mknod Christoph Hellwig
2009-06-12 15:58 ` Felix Blyakher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox