Re: [PATCH v5 13/23] fanotify: Allow file handle encoding for unhashed events
From: Jan Kara <jack@suse.cz>
Date: 2021-08-05 09:39:24
Also in:
linux-api, linux-fsdevel
On Wed 04-08-21 12:06:02, Gabriel Krisman Bertazi wrote:
FAN_FS_ERROR will report a file handle, but it is a unhashed event.n
^^ an ^ spurious 'n'.
Allow passing a NULL hash to fanotify_encode_fh and avoid calculating the hash if not needed. Signed-off-by: Gabriel Krisman Bertazi <redacted>
Otherwise looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza
quoted hunk ↗ jump to hunk
--- fs/notify/fanotify/fanotify.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index a015822e29d8..0d6ba218bc01 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c@@ -385,8 +385,12 @@ static int fanotify_encode_fh(struct fanotify_fh *fh, struct inode *inode, fh->type = type; fh->len = fh_len; - /* Mix fh into event merge key */ - *hash ^= fanotify_hash_fh(fh); + /* + * Mix fh into event merge key. Hash might be NULL in case of + * unhashed FID events (i.e. FAN_FS_ERROR). + */ + if (hash) + *hash ^= fanotify_hash_fh(fh); return FANOTIFY_FH_HDR_LEN + fh_len;-- 2.32.0
-- Jan Kara [off-list ref] SUSE Labs, CR