From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: amir73il@gmail.com
Cc: Gabriel Krisman Bertazi <krisman@collabora.com>,
kernel@collabora.com, "Darrick J . Wong" <djwong@kernel.org>,
Theodore Ts'o <tytso@mit.edu>, Dave Chinner <david@fromorbit.com>,
jack@suse.com, dhowells@redhat.com, khazhy@google.com,
linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org
Subject: [PATCH 01/11] fanotify: Fold event size calculation to its own function
Date: Thu, 20 May 2021 22:41:24 -0400 [thread overview]
Message-ID: <20210521024134.1032503-2-krisman@collabora.com> (raw)
In-Reply-To: <20210521024134.1032503-1-krisman@collabora.com>
Every time this function is invoked, it is immediately added to
FAN_EVENT_METADATA_LEN, since there is no need to just calculate the
length of info records. This minor clean up folds the rest of the
calculation into the function, which now operates in terms of events,
returning the size of the entire event, including metadata.
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
Changes since v1:
- rebased on top of hashing patches
---
fs/notify/fanotify/fanotify_user.c | 33 +++++++++++++++++-------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 71fefb30e015..3ccdee3c9f1e 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -117,17 +117,24 @@ static int fanotify_fid_info_len(int fh_len, int name_len)
return roundup(FANOTIFY_INFO_HDR_LEN + info_len, FANOTIFY_EVENT_ALIGN);
}
-static int fanotify_event_info_len(unsigned int fid_mode,
- struct fanotify_event *event)
+static size_t fanotify_event_len(struct fanotify_event *event,
+ unsigned int fid_mode)
{
- struct fanotify_info *info = fanotify_event_info(event);
- int dir_fh_len = fanotify_event_dir_fh_len(event);
- int fh_len = fanotify_event_object_fh_len(event);
- int info_len = 0;
+ size_t event_len = FAN_EVENT_METADATA_LEN;
+ struct fanotify_info *info;
+ int dir_fh_len;
+ int fh_len;
int dot_len = 0;
+ if (!fid_mode)
+ return event_len;
+
+ info = fanotify_event_info(event);
+ dir_fh_len = fanotify_event_dir_fh_len(event);
+ fh_len = fanotify_event_object_fh_len(event);
+
if (dir_fh_len) {
- info_len += fanotify_fid_info_len(dir_fh_len, info->name_len);
+ event_len += fanotify_fid_info_len(dir_fh_len, info->name_len);
} else if ((fid_mode & FAN_REPORT_NAME) && (event->mask & FAN_ONDIR)) {
/*
* With group flag FAN_REPORT_NAME, if name was not recorded in
@@ -137,9 +144,9 @@ static int fanotify_event_info_len(unsigned int fid_mode,
}
if (fh_len)
- info_len += fanotify_fid_info_len(fh_len, dot_len);
+ event_len += fanotify_fid_info_len(fh_len, dot_len);
- return info_len;
+ return event_len;
}
/*
@@ -168,7 +175,7 @@ static void fanotify_unhash_event(struct fsnotify_group *group,
static struct fanotify_event *get_one_event(struct fsnotify_group *group,
size_t count)
{
- size_t event_size = FAN_EVENT_METADATA_LEN;
+ size_t event_size;
struct fanotify_event *event = NULL;
struct fsnotify_event *fsn_event;
unsigned int fid_mode = FAN_GROUP_FLAG(group, FANOTIFY_FID_BITS);
@@ -181,8 +188,7 @@ static struct fanotify_event *get_one_event(struct fsnotify_group *group,
goto out;
event = FANOTIFY_E(fsn_event);
- if (fid_mode)
- event_size += fanotify_event_info_len(fid_mode, event);
+ event_size = fanotify_event_len(event, fid_mode);
if (event_size > count) {
event = ERR_PTR(-EINVAL);
@@ -412,8 +418,7 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
pr_debug("%s: group=%p event=%p\n", __func__, group, event);
- metadata.event_len = FAN_EVENT_METADATA_LEN +
- fanotify_event_info_len(fid_mode, event);
+ metadata.event_len = fanotify_event_len(event, fid_mode);
metadata.metadata_len = FAN_EVENT_METADATA_LEN;
metadata.vers = FANOTIFY_METADATA_VERSION;
metadata.reserved = 0;
--
2.31.0
next prev parent reply other threads:[~2021-05-21 2:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 2:41 [PATCH 00/11] File system wide monitoring Gabriel Krisman Bertazi
2021-05-21 2:41 ` Gabriel Krisman Bertazi [this message]
2021-05-21 2:41 ` [PATCH 02/11] fanotify: Split fsid check from other fid mode checks Gabriel Krisman Bertazi
2021-05-21 8:33 ` Amir Goldstein
2021-05-21 2:41 ` [PATCH 03/11] fanotify: Simplify directory sanity check in DFID_NAME mode Gabriel Krisman Bertazi
2021-05-21 8:37 ` Amir Goldstein
2021-05-21 2:41 ` [PATCH 04/11] fanotify: Expose fanotify_mark Gabriel Krisman Bertazi
2021-05-21 9:06 ` Amir Goldstein
2021-05-21 2:41 ` [PATCH 05/11] inotify: Don't force FS_IN_IGNORED Gabriel Krisman Bertazi
2021-05-21 9:07 ` Amir Goldstein
2021-05-21 2:41 ` [PATCH 06/11] fsnotify: Support FS_ERROR event type Gabriel Krisman Bertazi
2021-05-21 9:13 ` Amir Goldstein
2021-05-21 2:41 ` [PATCH 07/11] fsnotify: Introduce helpers to send error_events Gabriel Krisman Bertazi
2021-05-21 9:32 ` Amir Goldstein
2021-05-22 17:51 ` kernel test robot
2021-05-22 17:51 ` kernel test robot
2021-05-21 2:41 ` [PATCH 08/11] fanotify: Introduce FAN_ERROR event Gabriel Krisman Bertazi
2021-05-21 11:02 ` Amir Goldstein
2021-05-21 15:02 ` Darrick J. Wong
2021-05-21 2:41 ` [PATCH 09/11] ext4: Send notifications on error Gabriel Krisman Bertazi
2021-05-21 9:44 ` Amir Goldstein
2021-05-21 2:41 ` [PATCH 10/11] samples: Add fs error monitoring example Gabriel Krisman Bertazi
2021-05-21 9:48 ` Amir Goldstein
2021-05-26 23:37 ` Gabriel Krisman Bertazi
2021-05-22 20:21 ` kernel test robot
2021-05-22 20:21 ` kernel test robot
2021-05-21 2:41 ` [PATCH 11/11] Documentation: Document the FAN_ERROR event Gabriel Krisman Bertazi
2021-05-21 9:54 ` Amir Goldstein
2021-05-21 8:31 ` [PATCH 00/11] File system wide monitoring Amir Goldstein
2021-05-22 23:25 ` Theodore Y. Ts'o
2021-05-24 15:19 ` Gabriel Krisman Bertazi
2021-05-24 3:06 ` Ian Kent
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=20210521024134.1032503-2-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.