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-35' of git://repo.or.cz/linux-kbuild
[pandora-kernel.git]
/
fs
/
posix_acl.c
diff --git
a/fs/posix_acl.c
b/fs/posix_acl.c
index
aec931e
..
39df95a
100644
(file)
--- a/
fs/posix_acl.c
+++ b/
fs/posix_acl.c
@@
-217,11
+217,11
@@
posix_acl_permission(struct inode *inode, const struct posix_acl *acl, int want)
switch(pa->e_tag) {
case ACL_USER_OBJ:
/* (May have been checked already) */
switch(pa->e_tag) {
case ACL_USER_OBJ:
/* (May have been checked already) */
-
if (inode->i_uid == current->fsuid
)
+
if (inode->i_uid == current_fsuid()
)
goto check_perm;
break;
case ACL_USER:
goto check_perm;
break;
case ACL_USER:
-
if (pa->e_id == current->fsuid
)
+
if (pa->e_id == current_fsuid()
)
goto mask;
break;
case ACL_GROUP_OBJ:
goto mask;
break;
case ACL_GROUP_OBJ: