security: Remove security_old_inode_init_security()

As the remaining two users reiserfs and ocfs2 switched to
security_inode_init_security(), security_old_inode_init_security() can be
now removed.

Out-of-tree kernel modules should switch to security_inode_init_security()
too.

Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/include/linux/security.h b/include/linux/security.h
index 5984d0d..cd23221 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -336,9 +336,6 @@ int security_inode_init_security(struct inode *inode, struct inode *dir,
 int security_inode_init_security_anon(struct inode *inode,
                                      const struct qstr *name,
                                      const struct inode *context_inode);
-int security_old_inode_init_security(struct inode *inode, struct inode *dir,
-                                    const struct qstr *qstr, const char **name,
-                                    void **value, size_t *len);
 int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);
 int security_inode_link(struct dentry *old_dentry, struct inode *dir,
                         struct dentry *new_dentry);
@@ -778,15 +775,6 @@ static inline int security_inode_init_security_anon(struct inode *inode,
        return 0;
 }
 
-static inline int security_old_inode_init_security(struct inode *inode,
-                                                  struct inode *dir,
-                                                  const struct qstr *qstr,
-                                                  const char **name,
-                                                  void **value, size_t *len)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int security_inode_create(struct inode *dir,
                                         struct dentry *dentry,
                                         umode_t mode)

diff --git a/security/security.c b/security/security.c
index b808e1b..f4170ef 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -1655,17 +1655,6 @@ int security_inode_init_security_anon(struct inode *inode,
                             context_inode);
 }
 
-int security_old_inode_init_security(struct inode *inode, struct inode *dir,
-                                    const struct qstr *qstr, const char **name,
-                                    void **value, size_t *len)
-{
-       if (unlikely(IS_PRIVATE(inode)))
-               return -EOPNOTSUPP;
-       return call_int_hook(inode_init_security, -EOPNOTSUPP, inode, dir,
-                            qstr, name, value, len);
-}
-EXPORT_SYMBOL(security_old_inode_init_security);
-
 #ifdef CONFIG_SECURITY_PATH
 /**
  * security_path_mknod() - Check if creating a special file is allowed