projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull for-2.6.31 into release
[linux-2.6-microblaze.git]
/
fs
/
ocfs2
/
acl.c
diff --git
a/fs/ocfs2/acl.c
b/fs/ocfs2/acl.c
index
12dfb44
..
fbeaec7
100644
(file)
--- a/
fs/ocfs2/acl.c
+++ b/
fs/ocfs2/acl.c
@@
-296,7
+296,7
@@
int ocfs2_init_acl(handle_t *handle,
return PTR_ERR(acl);
}
if (!acl)
- inode->i_mode &= ~current
->fs->umask
;
+ inode->i_mode &= ~current
_umask()
;
}
if ((osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL) && acl) {
struct posix_acl *clone;