ima: remove unused cleanup functions
authorDmitry Kasatkin <dmitry.kasatkin@intel.com>
Mon, 25 Jun 2012 09:18:10 +0000 (12:18 +0300)
committerMimi Zohar <zohar@linux.vnet.ibm.com>
Mon, 2 Jul 2012 20:43:30 +0000 (16:43 -0400)
IMA cannot be used as module and does not need __exit functions.
Removed them.

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
security/integrity/ima/ima_fs.c
security/integrity/ima/ima_init.c
security/integrity/ima/ima_main.c

index 3fccc065a0fb4164c24d3737f55b30c3c2754a24..38477c9c3415cd9af47ec402e9694056a9ca3c22 100644 (file)
@@ -375,13 +375,3 @@ out:
        securityfs_remove(ima_policy);
        return -1;
 }
-
-void __exit ima_fs_cleanup(void)
-{
-       securityfs_remove(violations);
-       securityfs_remove(runtime_measurements_count);
-       securityfs_remove(ascii_runtime_measurements);
-       securityfs_remove(binary_runtime_measurements);
-       securityfs_remove(ima_dir);
-       securityfs_remove(ima_policy);
-}
index 17f1f060306ff3c2aca7c1364b36536d30c0c302..b5dfd534f13dad49b958748687800ccc02df3353 100644 (file)
@@ -90,8 +90,3 @@ int __init ima_init(void)
 
        return ima_fs_init();
 }
-
-void __exit ima_cleanup(void)
-{
-       ima_fs_cleanup();
-}
index a0e631a1905859acefa8f814aef1c9c20d997818..5b0548d75561316315b806389abe9a1cd1a99719 100644 (file)
@@ -262,11 +262,6 @@ static int __init init_ima(void)
        return error;
 }
 
-static void __exit cleanup_ima(void)
-{
-       ima_cleanup();
-}
-
 late_initcall(init_ima);       /* Start IMA after the TPM is available */
 
 MODULE_DESCRIPTION("Integrity Measurement Architecture");