projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
493b87e
)
xfs: fix small mismerge in xfs_vn_mknod
author
Christoph Hellwig
<hch@infradead.org>
Fri, 12 Jun 2009 15:19:11 +0000
(11:19 -0400)
committer
Felix Blyakher
<felixb@sgi.com>
Sat, 13 Jun 2009 02:15:31 +0000
(21:15 -0500)
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>
fs/xfs/linux-2.6/xfs_iops.c
patch
|
blob
|
history
diff --git
a/fs/xfs/linux-2.6/xfs_iops.c
b/fs/xfs/linux-2.6/xfs_iops.c
index
800dd4f
..
58973bb
100644
(file)
--- 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);