From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: jack@suse.com, amir73il@gmail.com
Cc: 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,
Gabriel Krisman Bertazi <krisman@collabora.com>,
kernel@collabora.com
Subject: [PATCH v4 09/16] fsnotify: Add wrapper around fsnotify_add_event
Date: Tue, 20 Jul 2021 11:59:37 -0400 [thread overview]
Message-ID: <20210720155944.1447086-10-krisman@collabora.com> (raw)
In-Reply-To: <20210720155944.1447086-1-krisman@collabora.com>
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(-)
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
next prev parent reply other threads:[~2021-07-20 16:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 15:59 [PATCH v4 00/16] File system wide monitoring Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 01/16] fsnotify: Don't insert unmergeable events in hashtable Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 02/16] fanotify: Fold event size calculation to its own function Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 03/16] fanotify: Split fsid check from other fid mode checks Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 04/16] fsnotify: Reserve mark bits for backends Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 05/16] fanotify: Split superblock marks out to a new cache Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 06/16] inotify: Don't force FS_IN_IGNORED Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 07/16] fsnotify: Add helper to detect overflow_event Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 08/16] fsnotify: pass arguments of fsnotify() in struct fsnotify_event_info Gabriel Krisman Bertazi
2021-07-31 6:38 ` [fsnotify] 4c40d6efc8: unixbench.score -3.3% regression kernel test robot
2021-07-31 9:27 ` Amir Goldstein
2021-07-31 16:27 ` Amir Goldstein
2021-08-03 14:22 ` Oliver Sang
2021-08-03 16:19 ` Amir Goldstein
2021-07-31 19:51 ` Gabriel Krisman Bertazi
2021-08-01 6:32 ` Amir Goldstein
2021-08-02 10:45 ` Jan Kara
2021-07-20 15:59 ` Gabriel Krisman Bertazi [this message]
2021-07-20 16:56 ` [PATCH v4 09/16] fsnotify: Add wrapper around fsnotify_add_event Amir Goldstein
2021-07-20 15:59 ` [PATCH v4 10/16] fsnotify: Support passing argument to insert callback on add_event Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 11/16] fsnotify: Support FS_ERROR event type Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 12/16] fsnotify: Introduce helpers to send error_events Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 13/16] fanotify: Introduce FAN_FS_ERROR event Gabriel Krisman Bertazi
2021-07-21 8:03 ` Amir Goldstein
2021-07-21 9:39 ` Amir Goldstein
2021-07-20 15:59 ` [PATCH v4 14/16] ext4: Send notifications on error Gabriel Krisman Bertazi
2021-07-20 15:59 ` [PATCH v4 15/16] samples: Add fs error monitoring example Gabriel Krisman Bertazi
2021-07-20 17:04 ` Amir Goldstein
2021-07-31 7:12 ` kernel test robot
2021-07-20 15:59 ` [PATCH v4 16/16] docs: Document the FAN_FS_ERROR event Gabriel Krisman Bertazi
2021-07-20 17:07 ` Amir Goldstein
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=20210720155944.1447086-10-krisman@collabora.com \
--to=krisman@collabora.com \
--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=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