git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
fs
/
ext2
/
acl.c
diff --git
a/fs/ext2/acl.c
b/fs/ext2/acl.c
index
ae8c4f8
..
d46e38c
100644
(file)
--- a/
fs/ext2/acl.c
+++ b/
fs/ext2/acl.c
@@
-318,7
+318,7
@@
ext2_init_acl(struct inode *inode, struct inode *dir)
return PTR_ERR(acl);
}
if (!acl)
- inode->i_mode &= ~current
->fs->umask
;
+ inode->i_mode &= ~current
_umask()
;
}
if (test_opt(inode->i_sb, POSIX_ACL) && acl) {
struct posix_acl *clone;