selinux: remove secondary ops call to inode_follow_link
authorJames Morris <jmorris@namei.org>
Thu, 29 Jan 2009 01:10:56 +0000 (12:10 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 29 Jan 2009 21:55:08 +0000 (08:55 +1100)
Remove secondary ops call to inode_follow_link, which is
a noop in capabilities.

Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
security/selinux/hooks.c

index 0362192..67291a3 100644 (file)
@@ -2674,11 +2674,7 @@ static int selinux_inode_readlink(struct dentry *dentry)
 static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *nameidata)
 {
        const struct cred *cred = current_cred();
-       int rc;
 
-       rc = secondary_ops->inode_follow_link(dentry, nameidata);
-       if (rc)
-               return rc;
        return dentry_has_perm(cred, NULL, dentry, FILE__READ);
 }