projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/pebs
[cascardo/linux.git]
/
fs
/
reiserfs
/
xattr_acl.c
diff --git
a/fs/reiserfs/xattr_acl.c
b/fs/reiserfs/xattr_acl.c
index
5296a29
..
b7e4fa4
100644
(file)
--- a/
fs/reiserfs/xattr_acl.c
+++ b/
fs/reiserfs/xattr_acl.c
@@
-21,7
+21,7
@@
xattr_set_acl(struct inode *inode, int type, const void *value, size_t size)
if (!reiserfs_posixacl(inode->i_sb))
return -EOPNOTSUPP;
- if (
(current->fsuid != inode->i_uid) && !capable(CAP_FOWNER
))
+ if (
!is_owner_or_cap(inode
))
return -EPERM;
if (value) {