Re: [PATCH sysctl-next 2/2] sysctl: remove redundant CONFIG_PROC_FS checks

[Joel Granados]

On Fri, Aug 07, 2026 at 05:48:11PM +0200, Oleg Nesterov wrote:
> Now that CONFIG_PROC_SYSCTL is gone, CONFIG_SYSCTL depends on
> CONFIG_PROC_FS directly in fs/proc/Kconfig, so the double guard
> defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS) is redundant.
> Simplify to "#ifdef CONFIG_SYSCTL".
> 
> Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
> ---
>  drivers/parport/procfs.c | 8 ++++----
>  fs/dcache.c              | 2 +-
>  fs/file_table.c          | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
> index 3880460e67f2..68a24e17a68f 100644
> --- a/drivers/parport/procfs.c
> +++ b/drivers/parport/procfs.c
> @@ -26,9 +26,9 @@
>  
>  #include <linux/uaccess.h>
>  
> -#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
> +#ifdef CONFIG_SYSCTL
>  
> -#define PARPORT_MIN_TIMESLICE_VALUE 1ul 
> +#define PARPORT_MIN_TIMESLICE_VALUE 1ul
Nit: Please remove the formatting changes from the series.

>  #define PARPORT_MAX_TIMESLICE_VALUE ((unsigned long) HZ)
>  #define PARPORT_MIN_SPINTIME_VALUE 1
>  #define PARPORT_MAX_SPINTIME_VALUE 1000
> @@ -560,7 +560,7 @@ static void __exit parport_default_proc_unregister(void)
>  	parport_bus_exit();
>  }
>  
> -#else /* no sysctl or no procfs*/
> +#else /* CONFIG_SYSCTL */
>  
>  int parport_proc_register(struct parport *pp)
>  {
> @@ -591,7 +591,7 @@ static void __exit parport_default_proc_unregister (void)
>  {
>  	parport_bus_exit();
>  }
> -#endif
> +#endif /* CONFIG_SYSCTL */
>  
>  subsys_initcall(parport_default_proc_register)
>  module_exit(parport_default_proc_unregister)
> diff --git a/fs/dcache.c b/fs/dcache.c
> index 3e9af9de7074..cb8a6b04a17a 100644
> --- a/fs/dcache.c
> +++ b/fs/dcache.c
> @@ -144,7 +144,7 @@ static DEFINE_PER_CPU(long, nr_dentry_unused);
>  static DEFINE_PER_CPU(long, nr_dentry_negative);
>  static int dentry_negative_policy;
>  
> -#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
> +#ifdef CONFIG_SYSCTL
>  /* Statistics gathering. */
>  static struct dentry_stat_t dentry_stat = {
>  	.age_limit = 45,
> diff --git a/fs/file_table.c b/fs/file_table.c
> index c68b8c0a4097..08ca3631b726 100644
> --- a/fs/file_table.c
> +++ b/fs/file_table.c
> @@ -122,7 +122,7 @@ unsigned long get_max_files(void)
>  }
>  EXPORT_SYMBOL_GPL(get_max_files);
>  
> -#if defined(CONFIG_SYSCTL) && defined(CONFIG_PROC_FS)
> +#ifdef CONFIG_SYSCTL
>  
>  /*
>   * Handle nr_files sysctl
> -- 
> 2.52.0
> 
>

Attachment: signature.asc
Description: PGP signature