From: Amir Goldstein <amir73il@gmail.com>
To: Jan Kara <jack@suse.cz>
Cc: linux-fsdevel@vger.kernel.org
Subject: [PATCH v5 11/22] dnotify: report both events on parent and child with single callback
Date: Thu, 16 Jul 2020 11:42:19 +0300 [thread overview]
Message-ID: <20200716084230.30611-12-amir73il@gmail.com> (raw)
In-Reply-To: <20200716084230.30611-1-amir73il@gmail.com>
For some events (e.g. DN_ATTRIB on sub-directory) fsnotify may call
dnotify_handle_event() once for watching parent and once again for
the watching sub-directory.
Do the same thing with a single callback instead of two callbacks when
marks iterator contains both inode and child entries.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/notify/dnotify/dnotify.c | 42 +++++++++++++++++++++++++------------
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
index 608c3e70e81f..305e5559560a 100644
--- a/fs/notify/dnotify/dnotify.c
+++ b/fs/notify/dnotify/dnotify.c
@@ -70,26 +70,15 @@ static void dnotify_recalc_inode_mask(struct fsnotify_mark *fsn_mark)
* destroy the dnotify struct if it was not registered to receive multiple
* events.
*/
-static int dnotify_handle_event(struct fsnotify_group *group, u32 mask,
- const void *data, int data_type,
- struct inode *dir,
- const struct qstr *file_name, u32 cookie,
- struct fsnotify_iter_info *iter_info)
+static void dnotify_one_event(struct fsnotify_group *group, u32 mask,
+ struct fsnotify_mark *inode_mark)
{
- struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
struct dnotify_mark *dn_mark;
struct dnotify_struct *dn;
struct dnotify_struct **prev;
struct fown_struct *fown;
__u32 test_mask = mask & ~FS_EVENT_ON_CHILD;
- /* not a dir, dnotify doesn't care */
- if (!dir)
- return 0;
-
- if (WARN_ON(fsnotify_iter_vfsmount_mark(iter_info)))
- return 0;
-
dn_mark = container_of(inode_mark, struct dnotify_mark, fsn_mark);
spin_lock(&inode_mark->lock);
@@ -111,6 +100,33 @@ static int dnotify_handle_event(struct fsnotify_group *group, u32 mask,
}
spin_unlock(&inode_mark->lock);
+}
+
+static int dnotify_handle_event(struct fsnotify_group *group, u32 mask,
+ const void *data, int data_type,
+ struct inode *dir,
+ const struct qstr *file_name, u32 cookie,
+ struct fsnotify_iter_info *iter_info)
+{
+ struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
+ struct fsnotify_mark *child_mark = fsnotify_iter_child_mark(iter_info);
+
+ /* not a dir, dnotify doesn't care */
+ if (!dir)
+ return 0;
+
+ if (WARN_ON(fsnotify_iter_vfsmount_mark(iter_info)))
+ return 0;
+
+ /*
+ * Some events can be sent on both parent dir and subdir marks
+ * (e.g. DN_ATTRIB). If both parent dir and subdir are watching,
+ * report the event once to parent dir and once to subdir.
+ */
+ if (inode_mark)
+ dnotify_one_event(group, mask, inode_mark);
+ if (child_mark)
+ dnotify_one_event(group, mask, child_mark);
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2020-07-16 8:42 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 8:42 [PATCH v5 00/22] fanotify events with name info Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 01/22] fanotify: generalize the handling of extra event flags Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 02/22] fanotify: generalize merge logic of events on dir Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 03/22] fanotify: distinguish between fid encode error and null fid Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 04/22] fanotify: generalize test for FAN_REPORT_FID Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 05/22] fanotify: mask out special event flags from ignored mask Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 06/22] fanotify: prepare for implicit event flags in mark mask Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 07/22] fanotify: use FAN_EVENT_ON_CHILD as implicit flag on sb/mount/non-dir marks Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 08/22] fsnotify: add object type "child" to object type iterator Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 09/22] fanotify: use struct fanotify_info to parcel the variable size buffer Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 10/22] fanotify: no external fh buffer in fanotify_name_event Amir Goldstein
2020-07-16 12:44 ` Jan Kara
2020-07-16 13:30 ` Amir Goldstein
2020-07-16 8:42 ` Amir Goldstein [this message]
2020-07-16 8:42 ` [PATCH v5 12/22] inotify: report both events on parent and child with single callback Amir Goldstein
2020-07-16 12:52 ` Jan Kara
2020-07-16 14:25 ` Amir Goldstein
2020-07-16 15:17 ` Jan Kara
2020-07-16 8:42 ` [PATCH v5 13/22] fanotify: " Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 14/22] fsnotify: send event to " Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 15/22] fsnotify: send event with parent/name info to sb/mount/non-dir marks Amir Goldstein
2020-07-16 17:01 ` Jan Kara
2020-07-16 17:20 ` Amir Goldstein
2020-07-16 17:57 ` Jan Kara
2020-07-16 18:42 ` Amir Goldstein
2020-07-16 22:34 ` Jan Kara
2020-07-17 3:49 ` Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 16/22] fsnotify: remove check that source dentry is positive Amir Goldstein
2020-07-16 13:13 ` Jan Kara
2020-07-16 13:29 ` Jan Kara
2020-07-16 13:54 ` Amir Goldstein
2020-07-16 14:06 ` Jan Kara
2020-07-16 8:42 ` [PATCH v5 17/22] fsnotify: send MOVE_SELF event with parent/name info Amir Goldstein
2020-07-16 13:45 ` Jan Kara
2020-07-16 13:59 ` Amir Goldstein
2020-07-16 14:10 ` Amir Goldstein
2020-07-16 15:57 ` Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 18/22] fanotify: add basic support for FAN_REPORT_DIR_FID Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 19/22] fanotify: report events with parent dir fid to sb/mount/non-dir marks Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 20/22] fanotify: add support for FAN_REPORT_NAME Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 21/22] fanotify: report parent fid + name + child fid Amir Goldstein
2020-07-16 15:59 ` Jan Kara
2020-07-16 16:08 ` Amir Goldstein
2020-07-16 8:42 ` [PATCH v5 22/22] fanotify: report parent fid " Amir Goldstein
2020-07-16 17:13 ` [PATCH v5 00/22] fanotify events with name info Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200716084230.30611-12-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).