fsnotify: cleanup should_send_event

[net-next-2.6.git] / fs / notify / fanotify / fanotify.c

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 666ccb733066ecefd1c0bd8bc4a242ced72f9d79..fbd7f35c6134b6e69743576a2419900d9b90dadc 100644 (file)
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -185,22 +185,15 @@ static bool should_send_inode_event(struct fsnotify_group *group,
        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,