diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2021-03-04 13:48:24 +0300 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2021-03-16 18:15:23 +0300 |
| commit | 7e3e5c6943994943eb76cab2d3a1806bc10b9045 (patch) | |
| tree | f44e88b4f466c39a6677bdb6a4c372ee1d48d34c /fs/notify/fanotify/fanotify.h | |
| parent | 8988f11abb820bacfcc53d498370bfb30f792ec4 (diff) | |
| download | linux-7e3e5c6943994943eb76cab2d3a1806bc10b9045.tar.xz | |
fanotify: mix event info and pid into merge key hash
Improve the merge key hash by mixing more values relevant for merge.
For example, all FAN_CREATE name events in the same dir used to have the
same merge key based on the dir inode. With this change the created
file name is mixed into the merge key.
The object id that was used as merge key is redundant to the event info
so it is no longer mixed into the hash.
Permission events are not hashed, so no need to hash their info.
Link: https://lore.kernel.org/r/20210304104826.3993892-4-amir73il@gmail.com
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/fanotify/fanotify.h')
| -rw-r--r-- | fs/notify/fanotify/fanotify.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h index d531f0cfa46f..9871f76cd9c2 100644 --- a/fs/notify/fanotify/fanotify.h +++ b/fs/notify/fanotify/fanotify.h @@ -115,6 +115,11 @@ static inline void fanotify_info_init(struct fanotify_info *info) info->name_len = 0; } +static inline unsigned int fanotify_info_len(struct fanotify_info *info) +{ + return info->dir_fh_totlen + info->file_fh_totlen + info->name_len; +} + static inline void fanotify_info_copy_name(struct fanotify_info *info, const struct qstr *name) { |