summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2014-10-02 22:05:24 -0400
committerEric Paris <eparis@redhat.com>2014-10-10 15:30:25 -0400
commit2991dd2b0117e864f394c826af6df144206ce0db (patch)
tree820b4d880f4c9fb7ebd88bc054f556f92cc62282
parente85322d21cfebeac64f58a204e9adc0bc5c1e46f (diff)
downloadlinux-2991dd2b0117e864f394c826af6df144206ce0db.tar.gz
linux-2991dd2b0117e864f394c826af6df144206ce0db.tar.bz2
linux-2991dd2b0117e864f394c826af6df144206ce0db.zip
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>
-rw-r--r--kernel/audit_tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index bd418c486e9a..e242e3a9864a 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);