diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-30 13:52:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-30 13:52:57 +0100 |
| commit | 5ea4b2dc75234871d652b398076868ef68f307bc (patch) | |
| tree | 549b1093514445094d515a28a217d64624f89d7e /fs | |
| parent | 40ef4277c51f6fdf33003a352eb952f8e8e4202c (diff) | |
| parent | 4991c8b72b564cd16cb48124f880617fd49f1013 (diff) | |
| download | linux-next-5ea4b2dc75234871d652b398076868ef68f307bc.tar.gz linux-next-5ea4b2dc75234871d652b398076868ef68f307bc.zip | |
Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dcache.c | 2 | ||||
| -rw-r--r-- | fs/file_table.c | 2 | ||||
| -rw-r--r-- | fs/proc/proc_sysctl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 7a9346c4f2e4..71918fe19d49 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -145,7 +145,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 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index d1cfd2941359..6c0859c66563 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -206,7 +206,7 @@ static void init_header(struct ctl_table_header *head, head->node = node; INIT_HLIST_HEAD(&head->inodes); if (node) { - const struct ctl_table *entry; + const struct ctl_table *entry __maybe_unused; list_for_each_table_entry(entry, head) { node->header = head; |