Re: [PATCH v5 1/8] net: Remove the now superfluous sentinel elements from ctl_table array
Sabrina Dubroca <[email protected]>
| Newsgroups | org.kernel.vger.lvs-devel,dev.linux.lists.bridge,dev.linux.lists.mptcp,org.kernel.vger.dccp,org.kernel.vger.linux-hams,org.kernel.vger.linux-kernel,org.kernel.vger.linux-nfs,org.kernel.vger.linux-rdma,org.kernel.vger.linux-s390,org.kernel.vger.linux-sctp,org.kernel.vger.linux-wpan,org.kernel.vger.linux-x25,org.kernel.vger.netdev,org.kernel.vger.netfilter-devel |
|---|---|
| Message-ID | <Zi9gG82_OKnLlFI2@hog> |
2024-04-26, 12:46:53 +0200, Joel Granados via B4 Relay wrote:
> diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
> index 6973dda3abda..a84690b13bb9 100644
> --- a/net/core/sysctl_net_core.c
> +++ b/net/core/sysctl_net_core.c
[...]
> @@ -723,12 +722,11 @@ static __net_init int sysctl_core_net_init(struct net *net)
> if (tbl == NULL)
> goto err_dup;
>
> - for (tmp = tbl; tmp->procname; tmp++)
> - tmp->data += (char *)net - (char *)&init_net;
Some coding style nits in case you re-post:
> + for (int i = 0; i < table_size; ++i)
move the declaration of int i out of the for (), it's almost never
written this way (at least in networking)
> + (tbl + i)->data += (char *)net - (char *)&init_net;
tbl[i].data = ...
is more in line with other similar functions in the rest of net/
[...]
> diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
> index 6dab883a08dd..ecc849678e7b 100644
> --- a/net/mpls/af_mpls.c
> +++ b/net/mpls/af_mpls.c
[...]
> @@ -2674,6 +2673,7 @@ static const struct ctl_table mpls_table[] = {
>
> static int mpls_net_init(struct net *net)
> {
> + size_t table_size = ARRAY_SIZE(mpls_table);
This table still has a {} as its final element. It should be gone too?
--
Sabrina