diff options
| author | Gustavo A. R. Silva <gustavoars@kernel.org> | 2026-03-30 16:38:18 -0600 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-04-06 18:37:52 -0700 |
| commit | 18474aed5d0d382f8057ceed7811a735134d28b9 (patch) | |
| tree | f5a0f7f4b62ed80d12c3ce34bd5ce5d3f0a4845a /include/linux/bpf-cgroup.h | |
| parent | 42e33c9af49c5199504bbfb16f65756a90fe90bf (diff) | |
| download | linux-next-18474aed5d0d382f8057ceed7811a735134d28b9.tar.gz linux-next-18474aed5d0d382f8057ceed7811a735134d28b9.zip | |
bpf: Avoid -Wflex-array-members-not-at-end warnings
Apparently, struct bpf_empty_prog_array exists entirely to populate a
single element of "items" in a global variable. "null_prog" is only
used during the initializer.
None of this is needed; globals will be correctly sized with an array
initializer of a flexible-array member.
So, remove struct bpf_empty_prog_array and adjust the rest of the code,
accordingly.
With these changes, fix the following warnings:
./include/linux/bpf.h:2369:31: warning: structure containing a flexible
array member is not at the end of another structure [-Wflex-array-member-not-at-end]
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Acked-by: Mykyta Yatsenko <yatsenko@meta.com>
Link: https://lore.kernel.org/r/acr7Whmn0br3xeBP@kspp
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/bpf-cgroup.h')
| -rw-r--r-- | include/linux/bpf-cgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 2f535331f926..b2e79c2b41d5 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -184,7 +184,7 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk, struct bpf_prog_array *array; array = rcu_access_pointer(cgrp->bpf.effective[type]); - return array != &bpf_empty_prog_array.hdr; + return array != &bpf_empty_prog_array; } /* Wrappers for __cgroup_bpf_run_filter_skb() guarded by cgroup_bpf_enabled. */ |