Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...

[firefly-linux-kernel-4.4.55.git] / fs / jffs2 / acl.c

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 95b79672150ab7b6159b00e3ca4083b41eaca9c7..828a0e1ea4387c19c91218b1e8d219a3d3b643b1 100644 (file)
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -402,7 +402,7 @@ static int jffs2_acl_setxattr(struct dentry *dentry, const char *name,
 
        if (name[0] != '\0')
                return -EINVAL;
-       if (!is_owner_or_cap(dentry->d_inode))
+       if (!inode_owner_or_capable(dentry->d_inode))
                return -EPERM;
 
        if (value) {