diff options
author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-08-19 07:56:18 -0400 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-09-09 10:28:46 -0400 |
commit | 65d98f3be25f7ee96af655f97e153d3d8d3d8ef9 (patch) | |
tree | e1a03bae9826a1a9a5def3ea50b6bcb44c266eed /security/integrity | |
parent | d9a2e5d788d39f7593e2af5e1a365e2b9300679f (diff) |
integrity: remove declaration of non-existing functions
Commit f381c27 "integrity: move ima inode integrity data management"
(re)moved few functions but left their declarations in header files.
This patch removes them and also removes duplicated declaration of
integrity_iint_find().
Commit c7de7ad "ima: remove unused cleanup functions". This patch
removes these definitions as well.
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity')
-rw-r--r-- | security/integrity/ima/ima.h | 9 | ||||
-rw-r--r-- | security/integrity/integrity.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 0fb456c20eda..c6990a723f73 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h | |||
@@ -90,10 +90,7 @@ extern struct list_head ima_measurements; /* list of all measurements */ | |||
90 | 90 | ||
91 | /* Internal IMA function definitions */ | 91 | /* Internal IMA function definitions */ |
92 | int ima_init(void); | 92 | int ima_init(void); |
93 | void ima_cleanup(void); | ||
94 | int ima_fs_init(void); | 93 | int ima_fs_init(void); |
95 | void ima_fs_cleanup(void); | ||
96 | int ima_inode_alloc(struct inode *inode); | ||
97 | int ima_add_template_entry(struct ima_template_entry *entry, int violation, | 94 | int ima_add_template_entry(struct ima_template_entry *entry, int violation, |
98 | const char *op, struct inode *inode, | 95 | const char *op, struct inode *inode, |
99 | const unsigned char *filename); | 96 | const unsigned char *filename); |
@@ -151,12 +148,6 @@ int ima_store_template(struct ima_template_entry *entry, int violation, | |||
151 | void ima_free_template_entry(struct ima_template_entry *entry); | 148 | void ima_free_template_entry(struct ima_template_entry *entry); |
152 | const char *ima_d_path(struct path *path, char **pathbuf); | 149 | const char *ima_d_path(struct path *path, char **pathbuf); |
153 | 150 | ||
154 | /* rbtree tree calls to lookup, insert, delete | ||
155 | * integrity data associated with an inode. | ||
156 | */ | ||
157 | struct integrity_iint_cache *integrity_iint_insert(struct inode *inode); | ||
158 | struct integrity_iint_cache *integrity_iint_find(struct inode *inode); | ||
159 | |||
160 | /* IMA policy related functions */ | 151 | /* IMA policy related functions */ |
161 | enum ima_hooks { FILE_CHECK = 1, MMAP_CHECK, BPRM_CHECK, MODULE_CHECK, FIRMWARE_CHECK, POST_SETATTR }; | 152 | enum ima_hooks { FILE_CHECK = 1, MMAP_CHECK, BPRM_CHECK, MODULE_CHECK, FIRMWARE_CHECK, POST_SETATTR }; |
162 | 153 | ||
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index 904e68abd49e..c0379d13dbe1 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h | |||
@@ -117,7 +117,6 @@ struct integrity_iint_cache { | |||
117 | /* rbtree tree calls to lookup, insert, delete | 117 | /* rbtree tree calls to lookup, insert, delete |
118 | * integrity data associated with an inode. | 118 | * integrity data associated with an inode. |
119 | */ | 119 | */ |
120 | struct integrity_iint_cache *integrity_iint_insert(struct inode *inode); | ||
121 | struct integrity_iint_cache *integrity_iint_find(struct inode *inode); | 120 | struct integrity_iint_cache *integrity_iint_find(struct inode *inode); |
122 | 121 | ||
123 | #define INTEGRITY_KEYRING_EVM 0 | 122 | #define INTEGRITY_KEYRING_EVM 0 |