projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull sbs into release branch
[linux-2.6-block.git]
/
fs
/
generic_acl.c
diff --git
a/fs/generic_acl.c
b/fs/generic_acl.c
index 9ccb789471713dc94a6768c4cd459bf973166ee3..995d63b2e747556c879c52be194375196995b58a 100644
(file)
--- a/
fs/generic_acl.c
+++ b/
fs/generic_acl.c
@@
-78,7
+78,7
@@
generic_acl_set(struct inode *inode, struct generic_acl_operations *ops,
if (S_ISLNK(inode->i_mode))
return -EOPNOTSUPP;
- if (
current->fsuid != inode->i_uid && !capable(CAP_FOWNER
))
+ if (
!is_owner_or_cap(inode
))
return -EPERM;
if (value) {
acl = posix_acl_from_xattr(value, size);