From cc6d698dd7ae24098faf8cec038f14809c7aff7f Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 9 Mar 2010 17:59:59 -0600 Subject: [PATCH] --- yaml --- r: 192399 b: refs/heads/master c: a19c5bbefb37ebe22fb42bd3861a8d3b2a2652a1 h: refs/heads/master i: 192397: c5143417dfc677285b16454be5f0796e85d1ec7c 192395: ffb40fe74d617bb00ef691481b1be1bf6f8a89e8 192391: 702f4fea76a72ac9254af9f9b9673f6e70cc3491 192383: 3f1a100f0bf5a37a4d66a28727545d45f178cd92 v: v3 --- [refs] | 2 +- trunk/security/integrity/ima/ima_iint.c | 6 +++--- trunk/security/integrity/ima/ima_main.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dace3ca7aa70..b2fab1545602 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 512ea3bc30c0e052a961e1abce8e783f3e28c92a +refs/heads/master: a19c5bbefb37ebe22fb42bd3861a8d3b2a2652a1 diff --git a/trunk/security/integrity/ima/ima_iint.c b/trunk/security/integrity/ima/ima_iint.c index 2d4d05d92fda..6cc22430cb44 100644 --- a/trunk/security/integrity/ima/ima_iint.c +++ b/trunk/security/integrity/ima/ima_iint.c @@ -79,17 +79,17 @@ void iint_free(struct kref *kref) iint->version = 0; iint->flags = 0UL; if (iint->readcount != 0) { - printk(KERN_INFO "%s: readcount: %ld\n", __FUNCTION__, + printk(KERN_INFO "%s: readcount: %ld\n", __func__, iint->readcount); iint->readcount = 0; } if (iint->writecount != 0) { - printk(KERN_INFO "%s: writecount: %ld\n", __FUNCTION__, + printk(KERN_INFO "%s: writecount: %ld\n", __func__, iint->writecount); iint->writecount = 0; } if (iint->opencount != 0) { - printk(KERN_INFO "%s: opencount: %ld\n", __FUNCTION__, + printk(KERN_INFO "%s: opencount: %ld\n", __func__, iint->opencount); iint->opencount = 0; } diff --git a/trunk/security/integrity/ima/ima_main.c b/trunk/security/integrity/ima/ima_main.c index 294b005d6520..983037fb9a9d 100644 --- a/trunk/security/integrity/ima/ima_main.c +++ b/trunk/security/integrity/ima/ima_main.c @@ -194,7 +194,7 @@ static void ima_dec_counts(struct ima_iint_cache *iint, struct inode *inode, (iint->writecount < 0)) && !ima_limit_imbalance(file)) { printk(KERN_INFO "%s: open/free imbalance (r:%ld w:%ld o:%ld)\n", - __FUNCTION__, iint->readcount, iint->writecount, + __func__, iint->readcount, iint->writecount, iint->opencount); dump_stack(); }