aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-04-07 15:14:50 -0400
committerJames Morris <jmorris@namei.org>2010-04-11 22:19:15 -0400
commit9d5ed77dadc66a72b40419c91df942adfa55a102 (patch)
treeeb55062edf757a7b7fe707adda7178181f8a4427 /security
parent91a9420f5826db482030c21eca8c507271bbc441 (diff)
security: remove dead hook inode_delete
Unused hook. Remove. Signed-off-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/capability.c5
-rw-r--r--security/security.c7
2 files changed, 0 insertions, 12 deletions
diff --git a/security/capability.c b/security/capability.c
index b64b50105a04..b855e9f27f0e 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -195,10 +195,6 @@ static int cap_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
195 return 0; 195 return 0;
196} 196}
197 197
198static void cap_inode_delete(struct inode *ino)
199{
200}
201
202static void cap_inode_post_setxattr(struct dentry *dentry, const char *name, 198static void cap_inode_post_setxattr(struct dentry *dentry, const char *name,
203 const void *value, size_t size, int flags) 199 const void *value, size_t size, int flags)
204{ 200{
@@ -936,7 +932,6 @@ void security_fixup_ops(struct security_operations *ops)
936 set_to_cap_if_null(ops, inode_permission); 932 set_to_cap_if_null(ops, inode_permission);
937 set_to_cap_if_null(ops, inode_setattr); 933 set_to_cap_if_null(ops, inode_setattr);
938 set_to_cap_if_null(ops, inode_getattr); 934 set_to_cap_if_null(ops, inode_getattr);
939 set_to_cap_if_null(ops, inode_delete);
940 set_to_cap_if_null(ops, inode_setxattr); 935 set_to_cap_if_null(ops, inode_setxattr);
941 set_to_cap_if_null(ops, inode_post_setxattr); 936 set_to_cap_if_null(ops, inode_post_setxattr);
942 set_to_cap_if_null(ops, inode_getxattr); 937 set_to_cap_if_null(ops, inode_getxattr);
diff --git a/security/security.c b/security/security.c
index 5223fa408271..c65b0bca05bb 100644
--- a/security/security.c
+++ b/security/security.c
@@ -550,13 +550,6 @@ int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
550 return security_ops->inode_getattr(mnt, dentry); 550 return security_ops->inode_getattr(mnt, dentry);
551} 551}
552 552
553void security_inode_delete(struct inode *inode)
554{
555 if (unlikely(IS_PRIVATE(inode)))
556 return;
557 security_ops->inode_delete(inode);
558}
559
560int security_inode_setxattr(struct dentry *dentry, const char *name, 553int security_inode_setxattr(struct dentry *dentry, const char *name,
561 const void *value, size_t size, int flags) 554 const void *value, size_t size, int flags)
562{ 555{