From 4d1ffb92116538eb777c45db790671978b7f86d2 Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri, 6 May 2011 11:34:17 +0300
Subject: [PATCH] --- yaml --- r: 264490 b: refs/heads/master c:
 24e0198efe0df50034ec1c14b2d7b5bb0f66d54a h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/security/integrity/evm/evm_main.c | 14 +++++++-------
 trunk/security/integrity/iint.c         |  2 +-
 trunk/security/integrity/integrity.h    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 418bae615d92..d063a0d0c8f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d38ca01c0c2d6c2e46ec1984db9ada6bad6ca26
+refs/heads/master: 24e0198efe0df50034ec1c14b2d7b5bb0f66d54a
diff --git a/trunk/security/integrity/evm/evm_main.c b/trunk/security/integrity/evm/evm_main.c
index bfe44dff61bb..eb07f9d13c24 100644
--- a/trunk/security/integrity/evm/evm_main.c
+++ b/trunk/security/integrity/evm/evm_main.c
@@ -56,8 +56,8 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
 	struct evm_ima_xattr_data xattr_data;
 	int rc;
 
-	if (iint->hmac_status == INTEGRITY_PASS)
-		return iint->hmac_status;
+	if (iint->evm_status == INTEGRITY_PASS)
+		return iint->evm_status;
 
 	/* if status is not PASS, try to check again - against -ENOMEM */
 
@@ -71,18 +71,18 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
 			   sizeof xattr_data, GFP_NOFS);
 	if (rc < 0)
 		goto err_out;
-	iint->hmac_status = INTEGRITY_PASS;
-	return iint->hmac_status;
+	iint->evm_status = INTEGRITY_PASS;
+	return iint->evm_status;
 
 err_out:
 	switch (rc) {
 	case -ENODATA:		/* file not labelled */
-		iint->hmac_status = INTEGRITY_NOLABEL;
+		iint->evm_status = INTEGRITY_NOLABEL;
 		break;
 	default:
-		iint->hmac_status = INTEGRITY_FAIL;
+		iint->evm_status = INTEGRITY_FAIL;
 	}
-	return iint->hmac_status;
+	return iint->evm_status;
 }
 
 static int evm_protected_xattr(const char *req_xattr_name)
diff --git a/trunk/security/integrity/iint.c b/trunk/security/integrity/iint.c
index 991df20709b0..0a23e075e1d2 100644
--- a/trunk/security/integrity/iint.c
+++ b/trunk/security/integrity/iint.c
@@ -157,7 +157,7 @@ static void init_once(void *foo)
 	iint->version = 0;
 	iint->flags = 0UL;
 	mutex_init(&iint->mutex);
-	iint->hmac_status = INTEGRITY_UNKNOWN;
+	iint->evm_status = INTEGRITY_UNKNOWN;
 }
 
 static int __init integrity_iintcache_init(void)
diff --git a/trunk/security/integrity/integrity.h b/trunk/security/integrity/integrity.h
index 7efbf560b7d5..880bbee2f534 100644
--- a/trunk/security/integrity/integrity.h
+++ b/trunk/security/integrity/integrity.h
@@ -37,7 +37,7 @@ struct integrity_iint_cache {
 	unsigned char flags;
 	u8 digest[SHA1_DIGEST_SIZE];
 	struct mutex mutex;	/* protects: version, flags, digest */
-	enum integrity_status hmac_status;
+	enum integrity_status evm_status;
 };
 
 /* rbtree tree calls to lookup, insert, delete