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 'viafb-next' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
fs
/
generic_acl.c
diff --git
a/fs/generic_acl.c
b/fs/generic_acl.c
index
06c48a8
..
8f26d1a
100644
(file)
--- a/
fs/generic_acl.c
+++ b/
fs/generic_acl.c
@@
-74,7
+74,7
@@
generic_acl_set(struct dentry *dentry, const char *name, const void *value,
return -EINVAL;
if (S_ISLNK(inode->i_mode))
return -EOPNOTSUPP;
- if (!i
s_owner_or_cap
(inode))
+ if (!i
node_owner_or_capable
(inode))
return -EPERM;
if (value) {
acl = posix_acl_from_xattr(value, size);