From 5c56d0c12e6497fa05511b190d007e255f0d0f9c Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Fri, 4 Dec 2009 15:48:08 -0500 Subject: [PATCH] --- yaml --- r: 177406 b: refs/heads/master c: 85a17f552dfe77efb44b971615e4f221a5f28f37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima.h | 1 - trunk/security/integrity/ima/ima_iint.c | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e312d741fa32..a9bea7186376 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0d5bd2aec4e69e720ee86958503923cafb45be5 +refs/heads/master: 85a17f552dfe77efb44b971615e4f221a5f28f37 diff --git a/trunk/security/integrity/ima/ima.h b/trunk/security/integrity/ima/ima.h index 268ef57b9142..c41afe6639a0 100644 --- a/trunk/security/integrity/ima/ima.h +++ b/trunk/security/integrity/ima/ima.h @@ -127,7 +127,6 @@ void ima_template_show(struct seq_file *m, void *e, */ struct ima_iint_cache *ima_iint_insert(struct inode *inode); struct ima_iint_cache *ima_iint_find_get(struct inode *inode); -void ima_iint_delete(struct inode *inode); void iint_free(struct kref *kref); void iint_rcu_free(struct rcu_head *rcu); diff --git a/trunk/security/integrity/ima/ima_iint.c b/trunk/security/integrity/ima/ima_iint.c index 2f6ab5258b1e..fa592ff1ac1c 100644 --- a/trunk/security/integrity/ima/ima_iint.c +++ b/trunk/security/integrity/ima/ima_iint.c @@ -19,8 +19,6 @@ #include #include "ima.h" -#define ima_iint_delete ima_inode_free - RADIX_TREE(ima_iint_store, GFP_ATOMIC); DEFINE_SPINLOCK(ima_iint_lock); @@ -111,12 +109,12 @@ void iint_rcu_free(struct rcu_head *rcu_head) } /** - * ima_iint_delete - called on integrity_inode_free + * ima_inode_free - called on security_inode_free * @inode: pointer to the inode * * Free the integrity information(iint) associated with an inode. */ -void ima_iint_delete(struct inode *inode) +void ima_inode_free(struct inode *inode) { struct ima_iint_cache *iint;