[PATCH] remove the inode_post_link and inode_post_rename LSM hooks

This patch removes the inode_post_link and inode_post_rename LSM hooks as
they are unused (and likely useless).

Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 0 insertions, 30 deletions

diff --git a/security/dummy.c b/security/dummy.c
index 5083314e14b1..9623a61dfc76 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -276,13 +276,6 @@ static int dummy_inode_link (struct dentry *old_dentry, struct inode *inode,
         return 0;
 }
 
-static void dummy_inode_post_link (struct dentry *old_dentry,
-                                   struct inode *inode,
-                                   struct dentry *new_dentry)
-{
-        return;
-}
-
 static int dummy_inode_unlink (struct inode *inode, struct dentry *dentry)
 {
         return 0;
@@ -319,14 +312,6 @@ static int dummy_inode_rename (struct inode *old_inode,
         return 0;
 }
 
-static void dummy_inode_post_rename (struct inode *old_inode,
-                                     struct dentry *old_dentry,
-                                     struct inode *new_inode,
-                                     struct dentry *new_dentry)
-{
-        return;
-}
-
 static int dummy_inode_readlink (struct dentry *dentry)
 {
         return 0;
@@ -871,14 +856,12 @@ void security_fixup_ops (struct security_operations *ops)
         set_to_dummy_if_null(ops, inode_init_security);
         set_to_dummy_if_null(ops, inode_create);
         set_to_dummy_if_null(ops, inode_link);
-        set_to_dummy_if_null(ops, inode_post_link);
         set_to_dummy_if_null(ops, inode_unlink);
         set_to_dummy_if_null(ops, inode_symlink);
         set_to_dummy_if_null(ops, inode_mkdir);
         set_to_dummy_if_null(ops, inode_rmdir);
         set_to_dummy_if_null(ops, inode_mknod);
         set_to_dummy_if_null(ops, inode_rename);
-        set_to_dummy_if_null(ops, inode_post_rename);
         set_to_dummy_if_null(ops, inode_readlink);
         set_to_dummy_if_null(ops, inode_follow_link);
         set_to_dummy_if_null(ops, inode_permission);
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index c9c20828be79..3f0b533be92c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2009,11 +2009,6 @@ static int selinux_inode_link(struct dentry *old_dentry, struct inode *dir, stru
         return may_link(dir, old_dentry, MAY_LINK);
 }
 
-static void selinux_inode_post_link(struct dentry *old_dentry, struct inode *inode, struct dentry *new_dentry)
-{
-        return;
-}
-
 static int selinux_inode_unlink(struct inode *dir, struct dentry *dentry)
 {
         int rc;
@@ -2056,12 +2051,6 @@ static int selinux_inode_rename(struct inode *old_inode, struct dentry *old_dent
         return may_rename(old_inode, old_dentry, new_inode, new_dentry);
 }
 
-static void selinux_inode_post_rename(struct inode *old_inode, struct dentry *old_dentry,
-                                      struct inode *new_inode, struct dentry *new_dentry)
-{
-        return;
-}
-
 static int selinux_inode_readlink(struct dentry *dentry)
 {
         return dentry_has_perm(current, NULL, dentry, FILE__READ);
@@ -4257,14 +4246,12 @@ static struct security_operations selinux_ops = {
         .inode_init_security =          selinux_inode_init_security,
         .inode_create =                 selinux_inode_create,
         .inode_link =                   selinux_inode_link,
-        .inode_post_link =              selinux_inode_post_link,
         .inode_unlink =                 selinux_inode_unlink,
         .inode_symlink =                selinux_inode_symlink,
         .inode_mkdir =                  selinux_inode_mkdir,
         .inode_rmdir =                  selinux_inode_rmdir,
         .inode_mknod =                  selinux_inode_mknod,
         .inode_rename =                 selinux_inode_rename,
-        .inode_post_rename =            selinux_inode_post_rename,
         .inode_readlink =               selinux_inode_readlink,
         .inode_follow_link =            selinux_inode_follow_link,
         .inode_permission =             selinux_inode_permission,