diff options
author | Eric Paris <eparis@redhat.com> | 2010-07-28 10:18:39 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2010-07-28 10:18:53 -0400 |
commit | 2612abb51b11ffd2d75c472b11178115f5808909 (patch) | |
tree | 5657a07a347984cc1f34117d7ef88af73ea12b60 /kernel | |
parent | 0215054f377ce5ac4ffc27b26b13b3f10e6410e6 (diff) |
fsnotify: cleanup should_send_event
The change to use srcu and walk the object list rather than the global
fsnotify_group list means that should_send_event is no longer needed for a
number of groups and can be simplified for others. Do that.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/audit_tree.c | 2 | ||||
-rw-r--r-- | kernel/audit_watch.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 584b94360217..2abb99f3459d 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c | |||
@@ -923,7 +923,7 @@ static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *in | |||
923 | struct vfsmount *mnt, struct fsnotify_mark *mark, | 923 | struct vfsmount *mnt, struct fsnotify_mark *mark, |
924 | __u32 mask, void *data, int data_type) | 924 | __u32 mask, void *data, int data_type) |
925 | { | 925 | { |
926 | return 0; | 926 | return false; |
927 | } | 927 | } |
928 | 928 | ||
929 | static const struct fsnotify_ops audit_tree_ops = { | 929 | static const struct fsnotify_ops audit_tree_ops = { |
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 9173bcf33763..097a61c65fe0 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c | |||
@@ -514,12 +514,7 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i | |||
514 | struct vfsmount *mnt, struct fsnotify_mark *mark, | 514 | struct vfsmount *mnt, struct fsnotify_mark *mark, |
515 | __u32 mask, void *data, int data_type) | 515 | __u32 mask, void *data, int data_type) |
516 | { | 516 | { |
517 | bool send; | 517 | return true; |
518 | |||
519 | mask = (mask & ~FS_EVENT_ON_CHILD); | ||
520 | send = (mark->mask & mask); | ||
521 | |||
522 | return send; | ||
523 | } | 518 | } |
524 | 519 | ||
525 | /* Update watch data in audit rules based on fsnotify events. */ | 520 | /* Update watch data in audit rules based on fsnotify events. */ |