diff options
author | Eric Paris <eparis@redhat.com> | 2009-12-04 15:48:08 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-12-16 12:16:46 -0500 |
commit | 85a17f552dfe77efb44b971615e4f221a5f28f37 (patch) | |
tree | bf9639dc2bb2dab926624a49a8b5aa1159876059 /security | |
parent | e0d5bd2aec4e69e720ee86958503923cafb45be5 (diff) |
ima: call ima_inode_free ima_inode_free
ima_inode_free() has some funky #define just to confuse the crap out of me.
void ima_iint_delete(struct inode *inode)
and then things actually call ima_inode_free() and nothing calls
ima_iint_delete().
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/ima/ima.h | 1 | ||||
-rw-r--r-- | security/integrity/ima/ima_iint.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 268ef57b9142..c41afe6639a0 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h | |||
@@ -127,7 +127,6 @@ void ima_template_show(struct seq_file *m, void *e, | |||
127 | */ | 127 | */ |
128 | struct ima_iint_cache *ima_iint_insert(struct inode *inode); | 128 | struct ima_iint_cache *ima_iint_insert(struct inode *inode); |
129 | struct ima_iint_cache *ima_iint_find_get(struct inode *inode); | 129 | struct ima_iint_cache *ima_iint_find_get(struct inode *inode); |
130 | void ima_iint_delete(struct inode *inode); | ||
131 | void iint_free(struct kref *kref); | 130 | void iint_free(struct kref *kref); |
132 | void iint_rcu_free(struct rcu_head *rcu); | 131 | void iint_rcu_free(struct rcu_head *rcu); |
133 | 132 | ||
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c index 2f6ab5258b1e..fa592ff1ac1c 100644 --- a/security/integrity/ima/ima_iint.c +++ b/security/integrity/ima/ima_iint.c | |||
@@ -19,8 +19,6 @@ | |||
19 | #include <linux/radix-tree.h> | 19 | #include <linux/radix-tree.h> |
20 | #include "ima.h" | 20 | #include "ima.h" |
21 | 21 | ||
22 | #define ima_iint_delete ima_inode_free | ||
23 | |||
24 | RADIX_TREE(ima_iint_store, GFP_ATOMIC); | 22 | RADIX_TREE(ima_iint_store, GFP_ATOMIC); |
25 | DEFINE_SPINLOCK(ima_iint_lock); | 23 | DEFINE_SPINLOCK(ima_iint_lock); |
26 | 24 | ||
@@ -111,12 +109,12 @@ void iint_rcu_free(struct rcu_head *rcu_head) | |||
111 | } | 109 | } |
112 | 110 | ||
113 | /** | 111 | /** |
114 | * ima_iint_delete - called on integrity_inode_free | 112 | * ima_inode_free - called on security_inode_free |
115 | * @inode: pointer to the inode | 113 | * @inode: pointer to the inode |
116 | * | 114 | * |
117 | * Free the integrity information(iint) associated with an inode. | 115 | * Free the integrity information(iint) associated with an inode. |
118 | */ | 116 | */ |
119 | void ima_iint_delete(struct inode *inode) | 117 | void ima_inode_free(struct inode *inode) |
120 | { | 118 | { |
121 | struct ima_iint_cache *iint; | 119 | struct ima_iint_cache *iint; |
122 | 120 | ||