projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ocfs2
/
acl.c
diff --git
a/fs/ocfs2/acl.c
b/fs/ocfs2/acl.c
index 69786e3eb43cdcc9c8034eabdd9ccbe65e2b5365..e913ad130fdd2cf9eafa0e73e343bad5974583e9 100644
(file)
--- a/
fs/ocfs2/acl.c
+++ b/
fs/ocfs2/acl.c
@@
-496,7
+496,7
@@
static int ocfs2_xattr_set_acl(struct dentry *dentry, const char *name,
if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
return -EOPNOTSUPP;
- if (!i
s_owner_or_cap
(inode))
+ if (!i
node_owner_or_capable
(inode))
return -EPERM;
if (value) {