aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-01-28 20:15:59 -0500
committerJames Morris <jmorris@namei.org>2009-01-29 16:55:10 -0500
commit438add6b32d9295db6e3ecd4d9e137086ec5b5d9 (patch)
tree70658fa14a51af66a3359e306d263955d3eaf13f /security/selinux
parent188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6 (diff)
selinux: remove secondary ops call to inode_setattr
Remove secondary ops call to inode_setattr, 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 7e90c9e58657..08b506846a1f 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2694,11 +2694,6 @@ static int selinux_inode_permission(struct inode *inode, int mask)
2694static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr) 2694static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
2695{ 2695{
2696 const struct cred *cred = current_cred(); 2696 const struct cred *cred = current_cred();
2697 int rc;
2698
2699 rc = secondary_ops->inode_setattr(dentry, iattr);
2700 if (rc)
2701 return rc;
2702 2697
2703 if (iattr->ia_valid & ATTR_FORCE) 2698 if (iattr->ia_valid & ATTR_FORCE)
2704 return 0; 2699 return 0;