From: Jan Kara <jack@suse.cz>
To: Gabriel Krisman Bertazi <krisman@collabora.com>
Cc: jack@suse.com, amir73il@gmail.com, djwong@kernel.org,
tytso@mit.edu, david@fromorbit.com, dhowells@redhat.com,
khazhy@google.com, linux-fsdevel@vger.kernel.org,
linux-ext4@vger.kernel.org, linux-api@vger.kernel.org,
kernel@collabora.com
Subject: Re: [PATCH v5 08/23] fsnotify: Add wrapper around fsnotify_add_event
Date: Thu, 5 Aug 2021 11:28:03 +0200 [thread overview]
Message-ID: <20210805092803.GD14483@quack2.suse.cz> (raw)
In-Reply-To: <20210804160612.3575505-9-krisman@collabora.com>
On Wed 04-08-21 12:05:57, Gabriel Krisman Bertazi wrote:
> fsnotify_add_event is growing in number of parameters, which is most
^^ in most
cases...
> case are just passed a NULL pointer. So, split out a new
> fsnotify_insert_event function to clean things up for users who don't
> need an insert hook.
>
> Suggested-by: Amir Goldstein <amir73il@gmail.com>
> Reviewed-by: Amir Goldstein <amir73il@gmail.com>
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Otherwise looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/notify/fanotify/fanotify.c | 4 ++--
> fs/notify/inotify/inotify_fsnotify.c | 2 +-
> fs/notify/notification.c | 12 ++++++------
> include/linux/fsnotify_backend.h | 23 ++++++++++++++++-------
> 4 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
> index c3eefe3f6494..acf78c0ed219 100644
> --- a/fs/notify/fanotify/fanotify.c
> +++ b/fs/notify/fanotify/fanotify.c
> @@ -781,8 +781,8 @@ static int fanotify_handle_event(struct fsnotify_group *group, u32 mask,
> }
>
> fsn_event = &event->fse;
> - ret = fsnotify_add_event(group, fsn_event, fanotify_merge,
> - fanotify_insert_event);
> + ret = fsnotify_insert_event(group, fsn_event, fanotify_merge,
> + fanotify_insert_event);
> if (ret) {
> /* Permission events shouldn't be merged */
> BUG_ON(ret == 1 && mask & FANOTIFY_PERM_EVENTS);
> diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
> index d1a64daa0171..a96582cbfad1 100644
> --- a/fs/notify/inotify/inotify_fsnotify.c
> +++ b/fs/notify/inotify/inotify_fsnotify.c
> @@ -116,7 +116,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,
> if (len)
> strcpy(event->name, name->name);
>
> - ret = fsnotify_add_event(group, fsn_event, inotify_merge, NULL);
> + ret = fsnotify_add_event(group, fsn_event, inotify_merge);
> if (ret) {
> /* Our event wasn't used in the end. Free it. */
> fsnotify_destroy_event(group, fsn_event);
> diff --git a/fs/notify/notification.c b/fs/notify/notification.c
> index 32f45543b9c6..44bb10f50715 100644
> --- a/fs/notify/notification.c
> +++ b/fs/notify/notification.c
> @@ -78,12 +78,12 @@ void fsnotify_destroy_event(struct fsnotify_group *group,
> * 2 if the event was not queued - either the queue of events has overflown
> * or the group is shutting down.
> */
> -int fsnotify_add_event(struct fsnotify_group *group,
> - struct fsnotify_event *event,
> - int (*merge)(struct fsnotify_group *,
> - struct fsnotify_event *),
> - void (*insert)(struct fsnotify_group *,
> - struct fsnotify_event *))
> +int fsnotify_insert_event(struct fsnotify_group *group,
> + struct fsnotify_event *event,
> + int (*merge)(struct fsnotify_group *,
> + struct fsnotify_event *),
> + void (*insert)(struct fsnotify_group *,
> + struct fsnotify_event *))
> {
> int ret = 0;
> struct list_head *list = &group->notification_list;
> diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
> index 2b5fb9327a77..cd4ca11f129e 100644
> --- a/include/linux/fsnotify_backend.h
> +++ b/include/linux/fsnotify_backend.h
> @@ -495,16 +495,25 @@ extern int fsnotify_fasync(int fd, struct file *file, int on);
> extern void fsnotify_destroy_event(struct fsnotify_group *group,
> struct fsnotify_event *event);
> /* attach the event to the group notification queue */
> -extern int fsnotify_add_event(struct fsnotify_group *group,
> - struct fsnotify_event *event,
> - int (*merge)(struct fsnotify_group *,
> - struct fsnotify_event *),
> - void (*insert)(struct fsnotify_group *,
> - struct fsnotify_event *));
> +extern int fsnotify_insert_event(struct fsnotify_group *group,
> + struct fsnotify_event *event,
> + int (*merge)(struct fsnotify_group *,
> + struct fsnotify_event *),
> + void (*insert)(struct fsnotify_group *,
> + struct fsnotify_event *));
> +
> +static inline int fsnotify_add_event(struct fsnotify_group *group,
> + struct fsnotify_event *event,
> + int (*merge)(struct fsnotify_group *,
> + struct fsnotify_event *))
> +{
> + return fsnotify_insert_event(group, event, merge, NULL);
> +}
> +
> /* Queue overflow event to a notification group */
> static inline void fsnotify_queue_overflow(struct fsnotify_group *group)
> {
> - fsnotify_add_event(group, group->overflow_event, NULL, NULL);
> + fsnotify_add_event(group, group->overflow_event, NULL);
> }
>
> static inline bool fsnotify_is_overflow_event(u32 mask)
> --
> 2.32.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2021-08-05 9:28 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 16:05 [PATCH v5 00/23] File system wide monitoring Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 01/23] fsnotify: Don't insert unmergeable events in hashtable Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 02/23] fanotify: Fold event size calculation to its own function Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 03/23] fanotify: Split fsid check from other fid mode checks Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 04/23] fsnotify: Reserve mark bits for backends Gabriel Krisman Bertazi
2021-08-05 8:44 ` kernel test robot
2021-08-05 9:14 ` Jan Kara
2021-08-04 16:05 ` [PATCH v5 05/23] fanotify: Split superblock marks out to a new cache Gabriel Krisman Bertazi
2021-08-05 9:24 ` Jan Kara
2021-08-04 16:05 ` [PATCH v5 06/23] inotify: Don't force FS_IN_IGNORED Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 07/23] fsnotify: Add helper to detect overflow_event Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 08/23] fsnotify: Add wrapper around fsnotify_add_event Gabriel Krisman Bertazi
2021-08-05 9:28 ` Jan Kara [this message]
2021-08-04 16:05 ` [PATCH v5 09/23] fsnotify: Support passing argument to insert callback on add_event Gabriel Krisman Bertazi
2021-08-04 16:05 ` [PATCH v5 10/23] fsnotify: Allow events reported with an empty inode Gabriel Krisman Bertazi
2021-08-05 10:24 ` Jan Kara
2021-08-05 14:14 ` Amir Goldstein
2021-08-05 15:55 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 11/23] fsnotify: Support FS_ERROR event type Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 12/23] fanotify: Expose helper to estimate file handle encoding length Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 13/23] fanotify: Allow file handle encoding for unhashed events Gabriel Krisman Bertazi
2021-08-05 9:39 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 14/23] fanotify: Encode invalid file handler when no inode is provided Gabriel Krisman Bertazi
2021-08-05 9:56 ` Jan Kara
2021-08-11 21:12 ` Gabriel Krisman Bertazi
2021-08-12 14:20 ` Jan Kara
2021-08-12 15:14 ` Gabriel Krisman Bertazi
2021-08-12 15:50 ` Amir Goldstein
2021-08-12 15:17 ` Amir Goldstein
2021-08-13 12:09 ` Jan Kara
2021-08-13 17:25 ` Amir Goldstein
2021-08-04 16:06 ` [PATCH v5 15/23] fanotify: Require fid_mode for any non-fd event Gabriel Krisman Bertazi
2021-08-05 10:29 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 16/23] fanotify: Reserve UAPI bits for FAN_FS_ERROR Gabriel Krisman Bertazi
2021-08-05 10:33 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 17/23] fanotify: Preallocate per superblock mark error event Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 18/23] fanotify: Handle FAN_FS_ERROR events Gabriel Krisman Bertazi
2021-08-05 12:15 ` Jan Kara
2021-08-05 13:50 ` Amir Goldstein
2021-08-10 1:35 ` Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 19/23] fanotify: Report fid info for file related file system errors Gabriel Krisman Bertazi
2021-08-05 11:28 ` Jan Kara
2021-08-05 12:06 ` Jan Kara
2021-08-04 16:06 ` [PATCH v5 20/23] fanotify: Emit generic error info type for error event Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 21/23] ext4: Send notifications on error Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 22/23] samples: Add fs error monitoring example Gabriel Krisman Bertazi
2021-08-04 16:06 ` [PATCH v5 23/23] docs: Document the FAN_FS_ERROR event Gabriel Krisman Bertazi
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=20210805092803.GD14483@quack2.suse.cz \
--to=jack@suse.cz \
--cc=amir73il@gmail.com \
--cc=david@fromorbit.com \
--cc=dhowells@redhat.com \
--cc=djwong@kernel.org \
--cc=jack@suse.com \
--cc=kernel@collabora.com \
--cc=khazhy@google.com \
--cc=krisman@collabora.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
/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).