If you are separating the work for permanently empty directories, you
can add this patch to that set. as well as 2/18
Best
On Mon, Dec 04, 2023 at 08:52:16AM +0100, Thomas Weißschuh wrote:
> It is used only once and that caller would be simpler with
> sysctl_is_perm_empty_ctl_header().
> So use this sibling function.
>
> Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
> ---
> fs/proc/proc_sysctl.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index 8064ea76f80b..689a30196d0c 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)
> return -EROFS;
>
> /* Am I creating a permanently empty directory? */
> - if (sysctl_is_perm_empty_ctl_table(header->ctl_table)) {
> + if (sysctl_is_perm_empty_ctl_header(header)) {
> if (!RB_EMPTY_ROOT(&dir->root))
> return -EINVAL;
> sysctl_set_perm_empty_ctl_header(dir_h);
>
> --
> 2.43.0
>
--
Joel Granados
Attachment:
signature.asc
Description: PGP signature
