From: Richard Guy Briggs <rgb@redhat.com>
Date: Fri, 3 Oct 2014 02:05:24 +0000 (-0400)
Subject: audit: rename audit_log_remove_rule to disambiguate for trees
X-Git-Tag: v4.14-rc1~5497^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2991dd2b0117e864f394c826af6df144206ce0db;p=platform%2Fkernel%2Flinux-rpi.git

audit: rename audit_log_remove_rule to disambiguate for trees

Rename audit_log_remove_rule() to audit_tree_log_remove_rule() to avoid
confusion with watch and mark rule removal/changes.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
---

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index bd418c48..e242e3a 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -449,7 +449,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)
 	return 0;
 }
 
-static void audit_log_remove_rule(struct audit_krule *rule)
+static void audit_tree_log_remove_rule(struct audit_krule *rule)
 {
 	struct audit_buffer *ab;
 
@@ -476,7 +476,7 @@ static void kill_rules(struct audit_tree *tree)
 		list_del_init(&rule->rlist);
 		if (rule->tree) {
 			/* not a half-baked one */
-			audit_log_remove_rule(rule);
+			audit_tree_log_remove_rule(rule);
 			rule->tree = NULL;
 			list_del_rcu(&entry->list);
 			list_del(&entry->rule.list);