diff --git a/[refs] b/[refs] index f7ba7b38898c..71c080565caf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f51115b9ab5b9cfd0b7be1cce75afbf3ffbcdd87 +refs/heads/master: 188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index 67291a385c75..7e90c9e58657 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -2681,11 +2681,6 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na static int selinux_inode_permission(struct inode *inode, int mask) { const struct cred *cred = current_cred(); - int rc; - - rc = secondary_ops->inode_permission(inode, mask); - if (rc) - return rc; if (!mask) { /* No permission to check. Existence test. */