diff options
| author | Christoph Hellwig <hch@infradead.org> | 2009-06-12 11:19:11 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-12 21:15:31 -0500 |
| commit | e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 (patch) | |
| tree | 24e6783973cb580a1074c4689b4978bff29c2167 /fs | |
| parent | 493b87e5ed352cf548e6456ddfc36576e28278ea (diff) | |
| download | kernel_samsung_tuna-e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3.zip kernel_samsung_tuna-e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3.tar.gz kernel_samsung_tuna-e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3.tar.bz2 | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 4 |
1 files 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 800dd4f..58973bb 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); |