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 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[pandora-kernel.git]
/
fs
/
jffs2
/
acl.c
diff --git
a/fs/jffs2/acl.c
b/fs/jffs2/acl.c
index
6e63e8b
..
043740d
100644
(file)
--- a/
fs/jffs2/acl.c
+++ b/
fs/jffs2/acl.c
@@
-336,7
+336,7
@@
int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
return PTR_ERR(acl);
if (!acl) {
- *i_mode &= ~current
->fs->umask
;
+ *i_mode &= ~current
_umask()
;
} else {
if (S_ISDIR(*i_mode))
jffs2_iset_acl(inode, &f->i_acl_default, acl);