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/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index e3e855ff0dd85f47e76ea08db89f01dea837ece8..c3dc15879a520b239d005c555cd07066fef9ecb1 100644 (file)
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -129,20 +129,11 @@ static bool dnotify_should_send_event(struct fsnotify_group *group,
                                      struct fsnotify_mark *mark, __u32 mask,
                                      void *data, int data_type)
 {
-       bool send;
-
-       /* !dir_notify_enable should never get here, don't waste time checking
-       if (!dir_notify_enable)
-               return 0; */
-
        /* not a dir, dnotify doesn't care */
        if (!S_ISDIR(inode->i_mode))
                return false;
 
-       mask = (mask & ~FS_EVENT_ON_CHILD);
-       send = (mask & mark->mask);
-
-       return send;
+       return true;
 }
 
 static void dnotify_free_mark(struct fsnotify_mark *fsn_mark)

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,

diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index 59d639996cad6e0da3f6e85760ccd6432cb2bb68..53b31f46d698c9d000437ced9fa8db342a041105 100644 (file)
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -180,8 +180,8 @@ static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,
                 " data_is=%d cookie=%d event=%p\n", __func__, group, to_tell,
                 mnt, mark, mask, data, data_is, cookie, *event);
 
-       if (!group->ops->should_send_event(group, to_tell, mnt, mark, mask,
-                                          data, data_is))
+       if (group->ops->should_send_event(group, to_tell, mnt, mark, mask,
+                                         data, data_is) == false)
                return 0;
        if (!*event) {
                *event = fsnotify_create_event(to_tell, mask, data,

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index aa3f93c03e0f3e7452966407a29f7ac7b9a11e7d..7cf518b25daacf64694977d5b785e4a8149965a8 100644 (file)
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -142,23 +142,15 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
                                      struct vfsmount *mnt, struct fsnotify_mark *mark,
                                      __u32 mask, void *data, int data_type)
 {
-       bool send;
-
-       pr_debug("%s: group=%p inode=%p mask=%x data=%p data_type=%d\n",
-                __func__, group, inode, mask, data, data_type);
-
-       mask = (mask & ~FS_EVENT_ON_CHILD);
-       send = (mark->mask & mask);
-
-       if (send && (mark->mask & FS_EXCL_UNLINK) &&
+       if ((mark->mask & FS_EXCL_UNLINK) &&
            (data_type == FSNOTIFY_EVENT_FILE)) {
                struct file *file  = data;
 
                if (d_unlinked(file->f_path.dentry))
-                       send = false;
+                       return false;
        }
 
-       return send;
+       return true;
 }
 
 /*

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 584b94360217fdded83653f44112907dc10c17f7..2abb99f3459d1750cc61b454105f2517ef1f470c 100644 (file)
--- 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
                                  struct vfsmount *mnt, struct fsnotify_mark *mark,
                                  __u32 mask, void *data, int data_type)
 {
-       return 0;
+       return false;
 }
 
 static const struct fsnotify_ops audit_tree_ops = {

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 9173bcf33763a8c803bec77b98154ee0d2f4aaa1..097a61c65fe0ede73d73d800ae188f01f4084751 100644 (file)
--- 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
                                          struct vfsmount *mnt, struct fsnotify_mark *mark,
                                          __u32 mask, void *data, int data_type)
 {
-       bool send;
-
-       mask = (mask & ~FS_EVENT_ON_CHILD);
-       send = (mark->mask & mask);
-
-       return send;
+       return true;
 }
 
 /* Update watch data in audit rules based on fsnotify events. */