Skip to content

Commit 0d57b97

Browse files
robertosassupcmoore
authored andcommitted
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>
1 parent de3004c commit 0d57b97

2 files changed

Lines changed: 0 additions & 23 deletions

File tree

include/linux/security.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,6 @@ int security_inode_init_security(struct inode *inode, struct inode *dir,
336336
int security_inode_init_security_anon(struct inode *inode,
337337
const struct qstr *name,
338338
const struct inode *context_inode);
339-
int security_old_inode_init_security(struct inode *inode, struct inode *dir,
340-
const struct qstr *qstr, const char **name,
341-
void **value, size_t *len);
342339
int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);
343340
int security_inode_link(struct dentry *old_dentry, struct inode *dir,
344341
struct dentry *new_dentry);
@@ -778,15 +775,6 @@ static inline int security_inode_init_security_anon(struct inode *inode,
778775
return 0;
779776
}
780777

781-
static inline int security_old_inode_init_security(struct inode *inode,
782-
struct inode *dir,
783-
const struct qstr *qstr,
784-
const char **name,
785-
void **value, size_t *len)
786-
{
787-
return -EOPNOTSUPP;
788-
}
789-
790778
static inline int security_inode_create(struct inode *dir,
791779
struct dentry *dentry,
792780
umode_t mode)

security/security.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,17 +1655,6 @@ int security_inode_init_security_anon(struct inode *inode,
16551655
context_inode);
16561656
}
16571657

1658-
int security_old_inode_init_security(struct inode *inode, struct inode *dir,
1659-
const struct qstr *qstr, const char **name,
1660-
void **value, size_t *len)
1661-
{
1662-
if (unlikely(IS_PRIVATE(inode)))
1663-
return -EOPNOTSUPP;
1664-
return call_int_hook(inode_init_security, -EOPNOTSUPP, inode, dir,
1665-
qstr, name, value, len);
1666-
}
1667-
EXPORT_SYMBOL(security_old_inode_init_security);
1668-
16691658
#ifdef CONFIG_SECURITY_PATH
16701659
/**
16711660
* security_path_mknod() - Check if creating a special file is allowed

0 commit comments

Comments
 (0)