aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/audit_watch.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-12-17 21:24:24 -0500
committerEric Paris <eparis@redhat.com>2010-07-28 09:58:53 -0400
commitd07754412f9cdc2f4a99318d5ee81ace6715ea99 (patch)
treef62902ad420de023c0fad931d9508903a9f42e3b /kernel/audit_watch.c
parente61ce86737b4d60521e4e71f9892fe4bdcfb688b (diff)
fsnotify: rename fsnotify_find_mark_entry to fsnotify_find_mark
the _entry portion of fsnotify functions is useless. Drop it. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/audit_watch.c')
-rw-r--r--kernel/audit_watch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index d8cb55a5c059..24ecbebf4354 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -102,7 +102,7 @@ static inline struct audit_parent *audit_find_parent(struct inode *inode)
102 struct fsnotify_mark *entry; 102 struct fsnotify_mark *entry;
103 103
104 spin_lock(&inode->i_lock); 104 spin_lock(&inode->i_lock);
105 entry = fsnotify_find_mark_entry(audit_watch_group, inode); 105 entry = fsnotify_find_mark(audit_watch_group, inode);
106 spin_unlock(&inode->i_lock); 106 spin_unlock(&inode->i_lock);
107 107
108 if (entry) 108 if (entry)
@@ -354,7 +354,7 @@ static void audit_remove_parent_watches(struct audit_parent *parent)
354 } 354 }
355 mutex_unlock(&audit_filter_mutex); 355 mutex_unlock(&audit_filter_mutex);
356 356
357 fsnotify_destroy_mark_by_entry(&parent->mark); 357 fsnotify_destroy_mark(&parent->mark);
358 358
359 fsnotify_recalc_group_mask(audit_watch_group); 359 fsnotify_recalc_group_mask(audit_watch_group);
360 360
@@ -504,7 +504,7 @@ void audit_remove_watch_rule(struct audit_krule *krule)
504 504
505 if (list_empty(&parent->watches)) { 505 if (list_empty(&parent->watches)) {
506 audit_get_parent(parent); 506 audit_get_parent(parent);
507 fsnotify_destroy_mark_by_entry(&parent->mark); 507 fsnotify_destroy_mark(&parent->mark);
508 audit_put_parent(parent); 508 audit_put_parent(parent);
509 } 509 }
510 } 510 }
@@ -521,7 +521,7 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i
521 bool send; 521 bool send;
522 522
523 spin_lock(&inode->i_lock); 523 spin_lock(&inode->i_lock);
524 entry = fsnotify_find_mark_entry(group, inode); 524 entry = fsnotify_find_mark(group, inode);
525 spin_unlock(&inode->i_lock); 525 spin_unlock(&inode->i_lock);
526 if (!entry) 526 if (!entry)
527 return false; 527 return false;