diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-10-17 02:31:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:43:07 -0400 |
commit | cbfee34520666862f8ff539e580c48958fbb7706 (patch) | |
tree | ded5cafce333e908a0fbeda1f7c55eaf7c1fbaaa /security/dummy.c | |
parent | b53767719b6cd8789392ea3e7e2eb7b8906898f0 (diff) |
security/ cleanups
This patch contains the following cleanups that are now possible:
- remove the unused security_operations->inode_xattr_getsuffix
- remove the no longer used security_operations->unregister_security
- remove some no longer required exit code
- remove a bunch of no longer used exports
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: James Morris <jmorris@namei.org>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/dummy.c')
-rw-r--r-- | security/dummy.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/security/dummy.c b/security/dummy.c index c77dec822385..bc43d4c7383e 100644 --- a/security/dummy.c +++ b/security/dummy.c | |||
@@ -401,11 +401,6 @@ static int dummy_inode_listsecurity(struct inode *inode, char *buffer, size_t bu | |||
401 | return 0; | 401 | return 0; |
402 | } | 402 | } |
403 | 403 | ||
404 | static const char *dummy_inode_xattr_getsuffix(void) | ||
405 | { | ||
406 | return NULL; | ||
407 | } | ||
408 | |||
409 | static int dummy_file_permission (struct file *file, int mask) | 404 | static int dummy_file_permission (struct file *file, int mask) |
410 | { | 405 | { |
411 | return 0; | 406 | return 0; |
@@ -915,11 +910,6 @@ static int dummy_register_security (const char *name, struct security_operations | |||
915 | return -EINVAL; | 910 | return -EINVAL; |
916 | } | 911 | } |
917 | 912 | ||
918 | static int dummy_unregister_security (const char *name, struct security_operations *ops) | ||
919 | { | ||
920 | return -EINVAL; | ||
921 | } | ||
922 | |||
923 | static void dummy_d_instantiate (struct dentry *dentry, struct inode *inode) | 913 | static void dummy_d_instantiate (struct dentry *dentry, struct inode *inode) |
924 | { | 914 | { |
925 | return; | 915 | return; |
@@ -1034,7 +1024,6 @@ void security_fixup_ops (struct security_operations *ops) | |||
1034 | set_to_dummy_if_null(ops, inode_removexattr); | 1024 | set_to_dummy_if_null(ops, inode_removexattr); |
1035 | set_to_dummy_if_null(ops, inode_need_killpriv); | 1025 | set_to_dummy_if_null(ops, inode_need_killpriv); |
1036 | set_to_dummy_if_null(ops, inode_killpriv); | 1026 | set_to_dummy_if_null(ops, inode_killpriv); |
1037 | set_to_dummy_if_null(ops, inode_xattr_getsuffix); | ||
1038 | set_to_dummy_if_null(ops, inode_getsecurity); | 1027 | set_to_dummy_if_null(ops, inode_getsecurity); |
1039 | set_to_dummy_if_null(ops, inode_setsecurity); | 1028 | set_to_dummy_if_null(ops, inode_setsecurity); |
1040 | set_to_dummy_if_null(ops, inode_listsecurity); | 1029 | set_to_dummy_if_null(ops, inode_listsecurity); |
@@ -1095,7 +1084,6 @@ void security_fixup_ops (struct security_operations *ops) | |||
1095 | set_to_dummy_if_null(ops, netlink_send); | 1084 | set_to_dummy_if_null(ops, netlink_send); |
1096 | set_to_dummy_if_null(ops, netlink_recv); | 1085 | set_to_dummy_if_null(ops, netlink_recv); |
1097 | set_to_dummy_if_null(ops, register_security); | 1086 | set_to_dummy_if_null(ops, register_security); |
1098 | set_to_dummy_if_null(ops, unregister_security); | ||
1099 | set_to_dummy_if_null(ops, d_instantiate); | 1087 | set_to_dummy_if_null(ops, d_instantiate); |
1100 | set_to_dummy_if_null(ops, getprocattr); | 1088 | set_to_dummy_if_null(ops, getprocattr); |
1101 | set_to_dummy_if_null(ops, setprocattr); | 1089 | set_to_dummy_if_null(ops, setprocattr); |