diff options
author | Richard Guy Briggs <rgb@redhat.com> | 2014-10-02 22:05:24 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2014-10-10 15:30:25 -0400 |
commit | 2991dd2b0117e864f394c826af6df144206ce0db (patch) | |
tree | 820b4d880f4c9fb7ebd88bc054f556f92cc62282 /kernel | |
parent | e85322d21cfebeac64f58a204e9adc0bc5c1e46f (diff) |
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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/audit_tree.c | 4 |
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) | |||
449 | return 0; | 449 | return 0; |
450 | } | 450 | } |
451 | 451 | ||
452 | static void audit_log_remove_rule(struct audit_krule *rule) | 452 | static void audit_tree_log_remove_rule(struct audit_krule *rule) |
453 | { | 453 | { |
454 | struct audit_buffer *ab; | 454 | struct audit_buffer *ab; |
455 | 455 | ||
@@ -476,7 +476,7 @@ static void kill_rules(struct audit_tree *tree) | |||
476 | list_del_init(&rule->rlist); | 476 | list_del_init(&rule->rlist); |
477 | if (rule->tree) { | 477 | if (rule->tree) { |
478 | /* not a half-baked one */ | 478 | /* not a half-baked one */ |
479 | audit_log_remove_rule(rule); | 479 | audit_tree_log_remove_rule(rule); |
480 | rule->tree = NULL; | 480 | rule->tree = NULL; |
481 | list_del_rcu(&entry->list); | 481 | list_del_rcu(&entry->list); |
482 | list_del(&entry->rule.list); | 482 | list_del(&entry->rule.list); |