Re: [PATCH 1/4] sysctl: drop sysctl_is_perm_empty_ctl_table

[Joel Granados]

On Thu, Feb 22, 2024 at 08:07:36AM +0100, Thomas Weißschuh wrote:
> It is used only twice and those callers are simpler with
> sysctl_is_perm_empty_ctl_header().
> So use this sibling function.
Can you please add a comment relating this to the constification effort.
> 
> Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
> ---
>  fs/proc/proc_sysctl.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index 37cde0efee57..2f4d4329d83d 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -48,10 +48,8 @@ struct ctl_table_header *register_sysctl_mount_point(const char *path)
>  }
>  EXPORT_SYMBOL(register_sysctl_mount_point);
>  
> -#define sysctl_is_perm_empty_ctl_table(tptr)		\
> -	(tptr[0].type == SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)
>  #define sysctl_is_perm_empty_ctl_header(hptr)		\
> -	(sysctl_is_perm_empty_ctl_table(hptr->ctl_table))
> +	(hptr->ctl_table[0].type == SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)
>  #define sysctl_set_perm_empty_ctl_header(hptr)		\
>  	(hptr->ctl_table[0].type = SYSCTL_TABLE_TYPE_PERMANENTLY_EMPTY)
>  #define sysctl_clear_perm_empty_ctl_header(hptr)	\
> @@ -233,7 +231,7 @@ static int insert_header(struct ctl_dir *dir, struct ctl_table_header *header)
>  
>  	/* Am I creating a permanently empty directory? */
>  	if (header->ctl_table_size > 0 &&
> -	    sysctl_is_perm_empty_ctl_table(header->ctl_table)) {
> +	    sysctl_is_perm_empty_ctl_header(header)) {
>  		if (!RB_EMPTY_ROOT(&dir->root))
>  			return -EINVAL;
>  		sysctl_set_perm_empty_ctl_header(dir_h);
> @@ -1204,7 +1202,7 @@ static bool get_links(struct ctl_dir *dir,
>  	struct ctl_table *entry, *link;
>  
>  	if (header->ctl_table_size == 0 ||
> -	    sysctl_is_perm_empty_ctl_table(header->ctl_table))
> +	    sysctl_is_perm_empty_ctl_header(header))
>  		return true;
>  
>  	/* Are there links available for every entry in table? */
> 
> -- 
> 2.43.2
> 

-- 

Joel Granados

Attachment: signature.asc
Description: PGP signature