diff options
author | Joel Granados <joel.granados@gmail.com> | 2023-08-09 12:49:58 +0200 |
---|---|---|
committer | Luis Chamberlain <mcgrof@kernel.org> | 2023-08-15 15:26:17 -0700 |
commit | 9edbfe92a0a1355bae1e47c8f542ac0d39f19f8c (patch) | |
tree | 9a327fa4329fb47e9d5f4666ea2ca7c0dfa694d3 /net/sysctl_net.c | |
parent | bff97cf11b261972cae90299432238cc9a9a6a51 (diff) | |
download | linux-stable-9edbfe92a0a1355bae1e47c8f542ac0d39f19f8c.tar.gz linux-stable-9edbfe92a0a1355bae1e47c8f542ac0d39f19f8c.tar.bz2 linux-stable-9edbfe92a0a1355bae1e47c8f542ac0d39f19f8c.zip |
sysctl: Add size to register_sysctl
This commit adds table_size to register_sysctl in preparation for the
removal of the sentinel elements in the ctl_table arrays (last empty
markers). And though we do *not* remove any sentinels in this commit, we
set things up by either passing the table_size explicitly or using
ARRAY_SIZE on the ctl_table arrays.
We replace the register_syctl function with a macro that will add the
ARRAY_SIZE to the new register_sysctl_sz function. In this way the
callers that are already using an array of ctl_table structs do not
change. For the callers that pass a ctl_table array pointer, we pass the
table_size to register_sysctl_sz instead of the macro.
Signed-off-by: Joel Granados <j.granados@samsung.com>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Diffstat (limited to 'net/sysctl_net.c')
-rw-r--r-- | net/sysctl_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 8ee4b74bc009..d9cbbb51b143 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -101,7 +101,7 @@ __init int net_sysctl_init(void) * registering "/proc/sys/net" as an empty directory not in a * network namespace. */ - net_header = register_sysctl("net", empty); + net_header = register_sysctl_sz("net", empty, 0); if (!net_header) goto out; ret = register_pernet_subsys(&sysctl_pernet_ops); |