1 files changed, 7 insertions, 45 deletions

diff --git a/security/dummy.c b/security/dummy.c
index 6ff887586479..9623a61dfc76 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -258,16 +258,16 @@ static void dummy_inode_free_security (struct inode *inode)
         return;
 }
 
-static int dummy_inode_create (struct inode *inode, struct dentry *dentry,
-                               int mask)
+static int dummy_inode_init_security (struct inode *inode, struct inode *dir,
+                                      char **name, void **value, size_t *len)
 {
-        return 0;
+        return -EOPNOTSUPP;
 }
 
-static void dummy_inode_post_create (struct inode *inode, struct dentry *dentry,
-                                     int mask)
+static int dummy_inode_create (struct inode *inode, struct dentry *dentry,
+                               int mask)
 {
-        return;
+        return 0;
 }
 
 static int dummy_inode_link (struct dentry *old_dentry, struct inode *inode,
@@ -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;
@@ -294,24 +287,12 @@ static int dummy_inode_symlink (struct inode *inode, struct dentry *dentry,
         return 0;
 }
 
-static void dummy_inode_post_symlink (struct inode *inode,
-                                      struct dentry *dentry, const char *name)
-{
-        return;
-}
-
 static int dummy_inode_mkdir (struct inode *inode, struct dentry *dentry,
                               int mask)
 {
         return 0;
 }
 
-static void dummy_inode_post_mkdir (struct inode *inode, struct dentry *dentry,
-                                    int mask)
-{
-        return;
-}
-
 static int dummy_inode_rmdir (struct inode *inode, struct dentry *dentry)
 {
         return 0;
@@ -323,12 +304,6 @@ static int dummy_inode_mknod (struct inode *inode, struct dentry *dentry,
         return 0;
 }
 
-static void dummy_inode_post_mknod (struct inode *inode, struct dentry *dentry,
-                                    int mode, dev_t dev)
-{
-        return;
-}
-
 static int dummy_inode_rename (struct inode *old_inode,
                                struct dentry *old_dentry,
                                struct inode *new_inode,
@@ -337,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;
@@ -886,20 +853,15 @@ void security_fixup_ops (struct security_operations *ops)
         set_to_dummy_if_null(ops, sb_post_pivotroot);
         set_to_dummy_if_null(ops, inode_alloc_security);
         set_to_dummy_if_null(ops, inode_free_security);
+        set_to_dummy_if_null(ops, inode_init_security);
         set_to_dummy_if_null(ops, inode_create);
-        set_to_dummy_if_null(ops, inode_post_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_post_symlink);
         set_to_dummy_if_null(ops, inode_mkdir);
-        set_to_dummy_if_null(ops, inode_post_mkdir);
         set_to_dummy_if_null(ops, inode_rmdir);
         set_to_dummy_if_null(ops, inode_mknod);
-        set_to_dummy_if_null(ops, inode_post_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);