[PATCH 05/14] fixup! audit: clean simple fsnotify implementation

Rename several "watch" references to "mark". --- kernel/audit_fsnotify.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c index d0aa8f5..707df2b 100644 --- a/kernel/audit_fsnotify.c +++ b/kernel/audit_fsnotify.c @@ -150,7 +150,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; @@ -194,12 +194,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, +static int audit_mark_handle_event(struct fsnotify_group *group, struct inode *to_tell, struct fsnotify_mark *inode_mark, struct fsnotify_mark *vfsmount_mark, @@ -235,13 +235,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