commit d9d300cdb6f233c4c591348919c758062198a4f4
author Dmitry Kasatkin <dmitry.kasatkin@intel.com> Wed Jun 27 11:26:14 2012 +0300
committer Mimi Zohar <zohar@linux.vnet.ibm.com> Wed Sep 12 07:28:05 2012 -0400
tree 2a00e8e9100b1d799e5b779008ad0081e7fe5264
parent e23eb920b0f3978687c497de2ac3eb9e281dab32

ima: rename ima_must_appraise_or_measure

When AUDIT action support is added to the IMA,
ima_must_appraise_or_measure() does not reflect the real meaning anymore.
Rename it to ima_get_action().

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

security/integrity/ima/ima_api.c

diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index 33d4685..f0d60e7 100644
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -97,7 +97,7 @@
 }
 
 /**
- * ima_must_appraise_or_measure - appraise & measure decision based on policy.
+ * ima_get_action - appraise & measure decision based on policy.
  * @inode: pointer to inode to measure
  * @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE)
  * @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP)
@@ -112,7 +112,7 @@
  * Returns IMA_MEASURE, IMA_APPRAISE mask.
  *
  */
-int ima_must_appraise_or_measure(struct inode *inode, int mask, int function)
+int ima_get_action(struct inode *inode, int mask, int function)
 {
 	int flags = IMA_MEASURE | IMA_APPRAISE;