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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[linux-2.6-block.git]
/
fs
/
ext2
/
acl.c
diff --git
a/fs/ext2/acl.c
b/fs/ext2/acl.c
index 7c420b800c3438fd02ab669368f48fb9a6f01c5a..e58669e1b87c6bab0e0a0ac8677713b5b2f3fbb8 100644
(file)
--- a/
fs/ext2/acl.c
+++ b/
fs/ext2/acl.c
@@
-464,7
+464,7
@@
ext2_xattr_set_acl(struct inode *inode, int type, const void *value,
if (!test_opt(inode->i_sb, POSIX_ACL))
return -EOPNOTSUPP;
- if (
(current->fsuid != inode->i_uid) && !capable(CAP_FOWNER
))
+ if (
!is_owner_or_cap(inode
))
return -EPERM;
if (value) {