mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 23:51:37 +00:00
ce218712b0
This commit comes at the tail end of a greater effort to remove the
empty elements at the end of the ctl_table arrays (sentinels) which
will reduce the overall build time size of the kernel and run time
memory bloat by ~64 bytes per sentinel (further information Link :
https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/)
* Remove sentinel element from ctl_table structs.
* Remove the zeroing out of an array element (to make it look like a
sentinel) in neigh_sysctl_register and lowpan_frags_ns_sysctl_register
This is not longer needed and is safe after commit c899710fe7
("networking: Update to register_net_sysctl_sz") added the array size
to the ctl_table registration.
* Replace the for loop stop condition in sysctl_core_net_init that tests
for procname == NULL with one that depends on array size
* Removed the "-1" in mpls_net_init that adjusted for having an extra
empty element when looping over ctl_table arrays
* Use a table_size variable to keep the value of ARRAY_SIZE
Signed-off-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
61 lines
1.2 KiB
C
61 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* NET4: Sysctl interface to net af_unix subsystem.
|
|
*
|
|
* Authors: Mike Shaver.
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sysctl.h>
|
|
|
|
#include <net/af_unix.h>
|
|
|
|
static struct ctl_table unix_table[] = {
|
|
{
|
|
.procname = "max_dgram_qlen",
|
|
.data = &init_net.unx.sysctl_max_dgram_qlen,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec
|
|
},
|
|
};
|
|
|
|
int __net_init unix_sysctl_register(struct net *net)
|
|
{
|
|
struct ctl_table *table;
|
|
|
|
if (net_eq(net, &init_net)) {
|
|
table = unix_table;
|
|
} else {
|
|
table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
|
|
if (!table)
|
|
goto err_alloc;
|
|
|
|
table[0].data = &net->unx.sysctl_max_dgram_qlen;
|
|
}
|
|
|
|
net->unx.ctl = register_net_sysctl_sz(net, "net/unix", table,
|
|
ARRAY_SIZE(unix_table));
|
|
if (net->unx.ctl == NULL)
|
|
goto err_reg;
|
|
|
|
return 0;
|
|
|
|
err_reg:
|
|
if (!net_eq(net, &init_net))
|
|
kfree(table);
|
|
err_alloc:
|
|
return -ENOMEM;
|
|
}
|
|
|
|
void unix_sysctl_unregister(struct net *net)
|
|
{
|
|
const struct ctl_table *table;
|
|
|
|
table = net->unx.ctl->ctl_table_arg;
|
|
unregister_net_sysctl_table(net->unx.ctl);
|
|
if (!net_eq(net, &init_net))
|
|
kfree(table);
|
|
}
|