aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-28 20:00:08 -0500
committerJames Morris <jmorris@namei.org>2009-01-29 16:55:06 -0500
commite4737250b751b4e0e802adae9a4d3ae0227b580b (patch)
tree98b121f355b548e02369cebfc8d871a805724d00 /security/selinux
parentefdfac437607e4acfed66c383091a376525eaec4 (diff)
selinux: remove secondary ops call to inode_unlink
Remove secondary ops call to inode_unlink, which is a noop in capabilities. Acked-by: Serge Hallyn <serue@us.ibm.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/hooks.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index da0e523157d0..ec834dc0b414 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2635,11 +2635,6 @@ static int selinux_inode_link(struct dentry *old_dentry, struct inode *dir, stru
2635 2635
2636static int selinux_inode_unlink(struct inode *dir, struct dentry *dentry) 2636static int selinux_inode_unlink(struct inode *dir, struct dentry *dentry)
2637{ 2637{
2638 int rc;
2639
2640 rc = secondary_ops->inode_unlink(dir, dentry);
2641 if (rc)
2642 return rc;
2643 return may_link(dir, dentry, MAY_UNLINK); 2638 return may_link(dir, dentry, MAY_UNLINK);
2644} 2639}
2645 2640