[PATCH 06/12] [V3] fixup! audit: clean simple fsnotify implementation

Richard Guy Briggs
2014-07-02T18:05:14Z

Rename several "watch" references to "mark".

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
---
kernel/audit_fsnotify.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c
index b936213..c66e91b 100644
--- a/kernel/audit_fsnotify.c
+++ b/kernel/audit_fsnotify.c
@@ -1,4 +1,4 @@
-/* audit_watch.c -- watching inodes
+/* audit_fsnotify.c -- tracking inodes
*
* Copyright 2003-2009 Red Hat, Inc.
* Copyright 2005 Hewlett-Packard Development Company, L.P.
@@ -145,7 +145,7 @@ out:
return audit_mark;
}

-static void audit_watch_log_rule_change(struct audit_fsnotify_mark *audit_mark, char *op)
+static void audit_mark_log_rule_change(struct audit_fsnotify_mark *audit_mark, char *op)
{
struct audit_buffer *ab;
struct audit_krule *rule = audit_mark->rule;
@@ -189,12 +189,12 @@ static void audit_remove_rule(struct audit_fsnotify_mark *audit_mark)
struct audit_krule *rule = audit_mark->rule;
struct audit_entry *entry = container_of(rule, struct audit_entry, rule);

- audit_watch_log_rule_change(audit_mark, "remove rule");
+ audit_mark_log_rule_change(audit_mark, "remove rule");
audit_del_rule(entry);
}

-/* Update watch data in audit rules based on fsnotify events. */
-static int audit_watch_handle_event(struct fsnotify_group *group,
+/* Update mark data in audit rules based on fsnotify events. */
+static int audit_mark_handle_event(struct fsnotify_group *group,
struct inode *to_tell,
struct fsnotify_mark *inode_mark,
struct fsnotify_mark *vfsmount_mark,
@@ -230,13 +230,13 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
return 0;
}

-static const struct fsnotify_ops audit_watch_fsnotify_ops = {
- .handle_event = audit_watch_handle_event,
+static const struct fsnotify_ops audit_mark_fsnotify_ops = {
+ .handle_event = audit_mark_handle_event,
};

static int __init audit_fsnotify_init(void)
{
- audit_fsnotify_group = fsnotify_alloc_group(&audit_watch_fsnotify_ops);
+ audit_fsnotify_group = fsnotify_alloc_group(&audit_mark_fsnotify_ops);
if (IS_ERR(audit_fsnotify_group)) {
audit_fsnotify_group = NULL;
audit_panic("cannot create audit fsnotify group");
--
1.7.1