| Message ID | e7746fbbd62371d286081d5266e88bbe8d3fe9f0.1683388991.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b50a8b0d57ab1ef11492171e98a030f48682eac3 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: openvswitch: Use struct_size() | expand |
On Sat, May 06, 2023 at 06:04:16PM +0200, Christophe JAILLET wrote: > Use struct_size() instead of hand writing it. > This is less verbose and more informative. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > It will also help scripts when __counted_by macro will be added. > See [1]. > > [1]: https://lore.kernel.org/all/6453f739.170a0220.62695.7785@mx.google.com/ This looks fine to me, but: ## Form letter - net-next-closed (text borrowed from others) The merge window for v6.3 has begun and therefore net-next is closed for new drivers, features, code refactoring and optimizations. We are currently accepting bug fixes only. Please repost when net-next reopens after May 8th. RFC patches sent for review only are obviously welcome at any time. See: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle
On 13 May 2023, at 9:25, Christophe JAILLET wrote: > Use struct_size() instead of hand writing it. > This is less verbose and more informative. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Change looks good to me. Acked-by: Eelco Chaudron <echaudro@redhat.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Sat, 6 May 2023 18:04:16 +0200 you wrote: > Use struct_size() instead of hand writing it. > This is less verbose and more informative. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > It will also help scripts when __counted_by macro will be added. > See [1]. > > [...] Here is the summary with links: - [net-next] net: openvswitch: Use struct_size() https://git.kernel.org/netdev/net-next/c/b50a8b0d57ab You are awesome, thank you!
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c index f2698d2316df..c4ebf810e4b1 100644 --- a/net/openvswitch/meter.c +++ b/net/openvswitch/meter.c @@ -69,9 +69,7 @@ static struct dp_meter_instance *dp_meter_instance_alloc(const u32 size) { struct dp_meter_instance *ti; - ti = kvzalloc(sizeof(*ti) + - sizeof(struct dp_meter *) * size, - GFP_KERNEL); + ti = kvzalloc(struct_size(ti, dp_meters, size), GFP_KERNEL); if (!ti) return NULL;
Use struct_size() instead of hand writing it. This is less verbose and more informative. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- It will also help scripts when __counted_by macro will be added. See [1]. [1]: https://lore.kernel.org/all/6453f739.170a0220.62695.7785@mx.google.com/ --- net/openvswitch/meter.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)