[v4,09/16] fsnotify: Add wrapper around fsnotify_add_event

fsnotify_add_event is growing in number of parameters, which is most
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>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
 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(-)

On Tue, Jul 20, 2021 at 7:00 PM Gabriel Krisman Bertazi
<krisman@collabora.com> wrote:
>
> fsnotify_add_event is growing in number of parameters, which is most
> 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>
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
> ---

Reviewed-by: Amir Goldstein <amir73il@gmail.com>

>  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 6875d4d34c0c..93f96589ad1e 100644
> --- a/fs/notify/fanotify/fanotify.c
> +++ b/fs/notify/fanotify/fanotify.c
> @@ -778,8 +778,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 3c6fb43276ba..435982f88687 100644
> --- a/include/linux/fsnotify_backend.h
> +++ b/include/linux/fsnotify_backend.h
> @@ -522,16 +522,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
>