diff mbox series

[v8,24/32] fanotify: Add helpers to decide whether to report FID/DFID

Message ID 20211019000015.1666608-25-krisman@collabora.com (mailing list archive)
State New, archived
Headers show
Series file system-wide error monitoring | expand

Commit Message

Gabriel Krisman Bertazi Oct. 19, 2021, midnight UTC 
Now that there is an event that reports FID records even for a zeroed
file handle, wrap the logic that deides whether to issue the records
into helper functions.  This shouldn't have any impact on the code, but
simplifies further patches.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
 fs/notify/fanotify/fanotify.h      | 13 +++++++++++++
 fs/notify/fanotify/fanotify_user.c | 13 +++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

Comments

Amir Goldstein Oct. 19, 2021, 6:12 a.m. UTC | #1 
On Tue, Oct 19, 2021 at 3:03 AM Gabriel Krisman Bertazi
<krisman@collabora.com> wrote:
>
> Now that there is an event that reports FID records even for a zeroed
> file handle, wrap the logic that deides whether to issue the records
> into helper functions.  This shouldn't have any impact on the code, but
> simplifies further patches.
>
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
> ---
>  fs/notify/fanotify/fanotify.h      | 13 +++++++++++++
>  fs/notify/fanotify/fanotify_user.c | 13 +++++++------
>  2 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h
> index a5e81d759f65..bdf01ad4f9bf 100644
> --- a/fs/notify/fanotify/fanotify.h
> +++ b/fs/notify/fanotify/fanotify.h
> @@ -265,6 +265,19 @@ static inline int fanotify_event_dir_fh_len(struct fanotify_event *event)
>         return info ? fanotify_info_dir_fh_len(info) : 0;
>  }
>
> +static inline bool fanotify_event_has_object_fh(struct fanotify_event *event)
> +{
> +       if (fanotify_event_object_fh_len(event) > 0)
> +               return true;
> +
> +       return false;

Sorry, this construct gives me a rush ;)
What's wrong with

return fanotify_event_object_fh_len(event) > 0;

> +}
> +
> +static inline bool fanotify_event_has_dir_fh(struct fanotify_event *event)
> +{
> +       return (fanotify_event_dir_fh_len(event) > 0) ? true : false;
> +}

Likewise, except '(cond) ? true : false' gives me an even more
irritating rush...

Thanks,
Amir.
Jan Kara Oct. 19, 2021, 2:03 p.m. UTC | #2 
On Mon 18-10-21 21:00:07, Gabriel Krisman Bertazi wrote:
> Now that there is an event that reports FID records even for a zeroed
> file handle, wrap the logic that deides whether to issue the records
				    ^^^^ decides

> into helper functions.  This shouldn't have any impact on the code, but
> simplifies further patches.
> 
> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>

Looks good to me but I agree with Amir there's no need to explicit true /
false returns when checking just a simple condition.

Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza


> ---
>  fs/notify/fanotify/fanotify.h      | 13 +++++++++++++
>  fs/notify/fanotify/fanotify_user.c | 13 +++++++------
>  2 files changed, 20 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h
> index a5e81d759f65..bdf01ad4f9bf 100644
> --- a/fs/notify/fanotify/fanotify.h
> +++ b/fs/notify/fanotify/fanotify.h
> @@ -265,6 +265,19 @@ static inline int fanotify_event_dir_fh_len(struct fanotify_event *event)
>  	return info ? fanotify_info_dir_fh_len(info) : 0;
>  }
>  
> +static inline bool fanotify_event_has_object_fh(struct fanotify_event *event)
> +{
> +	if (fanotify_event_object_fh_len(event) > 0)
> +		return true;
> +
> +	return false;
> +}
> +
> +static inline bool fanotify_event_has_dir_fh(struct fanotify_event *event)
> +{
> +	return (fanotify_event_dir_fh_len(event) > 0) ? true : false;
> +}
> +
>  struct fanotify_path_event {
>  	struct fanotify_event fae;
>  	struct path path;
> diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
> index a860c286e885..ae848306a017 100644
> --- a/fs/notify/fanotify/fanotify_user.c
> +++ b/fs/notify/fanotify/fanotify_user.c
> @@ -140,10 +140,9 @@ static size_t fanotify_event_len(unsigned int info_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) {
> +	if (fanotify_event_has_dir_fh(event)) {
> +		dir_fh_len = fanotify_event_dir_fh_len(event);
>  		event_len += fanotify_fid_info_len(dir_fh_len, info->name_len);
>  	} else if ((info_mode & FAN_REPORT_NAME) &&
>  		   (event->mask & FAN_ONDIR)) {
> @@ -157,8 +156,10 @@ static size_t fanotify_event_len(unsigned int info_mode,
>  	if (info_mode & FAN_REPORT_PIDFD)
>  		event_len += FANOTIFY_PIDFD_INFO_HDR_LEN;
>  
> -	if (fh_len)
> +	if (fanotify_event_has_object_fh(event)) {
> +		fh_len = fanotify_event_object_fh_len(event);
>  		event_len += fanotify_fid_info_len(fh_len, dot_len);
> +	}
>  
>  	return event_len;
>  }
> @@ -451,7 +452,7 @@ static int copy_info_records_to_user(struct fanotify_event *event,
>  	/*
>  	 * Event info records order is as follows: dir fid + name, child fid.
>  	 */
> -	if (fanotify_event_dir_fh_len(event)) {
> +	if (fanotify_event_has_dir_fh(event)) {
>  		info_type = info->name_len ? FAN_EVENT_INFO_TYPE_DFID_NAME :
>  					     FAN_EVENT_INFO_TYPE_DFID;
>  		ret = copy_fid_info_to_user(fanotify_event_fsid(event),
> @@ -467,7 +468,7 @@ static int copy_info_records_to_user(struct fanotify_event *event,
>  		total_bytes += ret;
>  	}
>  
> -	if (fanotify_event_object_fh_len(event)) {
> +	if (fanotify_event_has_object_fh(event)) {
>  		const char *dot = NULL;
>  		int dot_len = 0;
>  
> -- 
> 2.33.0
>
diff mbox series

Patch

diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h
index a5e81d759f65..bdf01ad4f9bf 100644
--- a/fs/notify/fanotify/fanotify.h
+++ b/fs/notify/fanotify/fanotify.h
@@ -265,6 +265,19 @@  static inline int fanotify_event_dir_fh_len(struct fanotify_event *event)
 	return info ? fanotify_info_dir_fh_len(info) : 0;
 }
 
+static inline bool fanotify_event_has_object_fh(struct fanotify_event *event)
+{
+	if (fanotify_event_object_fh_len(event) > 0)
+		return true;
+
+	return false;
+}
+
+static inline bool fanotify_event_has_dir_fh(struct fanotify_event *event)
+{
+	return (fanotify_event_dir_fh_len(event) > 0) ? true : false;
+}
+
 struct fanotify_path_event {
 	struct fanotify_event fae;
 	struct path path;
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index a860c286e885..ae848306a017 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -140,10 +140,9 @@  static size_t fanotify_event_len(unsigned int info_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) {
+	if (fanotify_event_has_dir_fh(event)) {
+		dir_fh_len = fanotify_event_dir_fh_len(event);
 		event_len += fanotify_fid_info_len(dir_fh_len, info->name_len);
 	} else if ((info_mode & FAN_REPORT_NAME) &&
 		   (event->mask & FAN_ONDIR)) {
@@ -157,8 +156,10 @@  static size_t fanotify_event_len(unsigned int info_mode,
 	if (info_mode & FAN_REPORT_PIDFD)
 		event_len += FANOTIFY_PIDFD_INFO_HDR_LEN;
 
-	if (fh_len)
+	if (fanotify_event_has_object_fh(event)) {
+		fh_len = fanotify_event_object_fh_len(event);
 		event_len += fanotify_fid_info_len(fh_len, dot_len);
+	}
 
 	return event_len;
 }
@@ -451,7 +452,7 @@  static int copy_info_records_to_user(struct fanotify_event *event,
 	/*
 	 * Event info records order is as follows: dir fid + name, child fid.
 	 */
-	if (fanotify_event_dir_fh_len(event)) {
+	if (fanotify_event_has_dir_fh(event)) {
 		info_type = info->name_len ? FAN_EVENT_INFO_TYPE_DFID_NAME :
 					     FAN_EVENT_INFO_TYPE_DFID;
 		ret = copy_fid_info_to_user(fanotify_event_fsid(event),
@@ -467,7 +468,7 @@  static int copy_info_records_to_user(struct fanotify_event *event,
 		total_bytes += ret;
 	}
 
-	if (fanotify_event_object_fh_len(event)) {
+	if (fanotify_event_has_object_fh(event)) {
 		const char *dot = NULL;
 		int dot_len = 0;