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>
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 666ccb7..fbd7f35 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -185,22 +185,15 @@
pr_debug("%s: group=%p inode=%p mark=%p mask=%x\n",
__func__, group, inode, mark, mask);
- /* if the event is for a child and this inode doesn't care about
- * events on the child, don't send it! */
+ /*
+ * if the event is for a child and this inode doesn't care about
+ * events on the child, don't send it!
+ */
if ((mask & FS_EVENT_ON_CHILD) &&
- !(mark->mask & FS_EVENT_ON_CHILD)) {
- mask = 0;
- } else {
- /*
- * We care about children, but do we care about this particular
- * type of event?
- */
- mask &= ~FS_EVENT_ON_CHILD;
- mask &= mark->mask;
- mask &= ~mark->ignored_mask;
- }
-
- return mask;
+ !(mark->mask & FS_EVENT_ON_CHILD))
+ return false;
+ else
+ return true;
}
static bool fanotify_should_send_event(struct fsnotify_group *group, struct inode *to_tell,