Commit 449e14bf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Daniel Borkmann

bpf: Fix unused variable warning

Hiding the only using of bpf_link_type_strs[] in an #ifdef causes
an unused-variable warning:

kernel/bpf/syscall.c:2280:20: error: 'bpf_link_type_strs' defined but not used [-Werror=unused-variable]
 2280 | static const char *bpf_link_type_strs[] = {

Move the definition into the same #ifdef.

Fixes: f2e10bff ("bpf: Add support for BPF_OBJ_GET_INFO_BY_FD for bpf_link")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200429132217.1294289-1-arnd@arndb.de
parent 0b9ad56b
...@@ -2271,6 +2271,7 @@ static int bpf_link_release(struct inode *inode, struct file *filp) ...@@ -2271,6 +2271,7 @@ static int bpf_link_release(struct inode *inode, struct file *filp)
return 0; return 0;
} }
#ifdef CONFIG_PROC_FS
#define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type) #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
#define BPF_MAP_TYPE(_id, _ops) #define BPF_MAP_TYPE(_id, _ops)
#define BPF_LINK_TYPE(_id, _name) [_id] = #_name, #define BPF_LINK_TYPE(_id, _name) [_id] = #_name,
...@@ -2282,7 +2283,6 @@ static const char *bpf_link_type_strs[] = { ...@@ -2282,7 +2283,6 @@ static const char *bpf_link_type_strs[] = {
#undef BPF_MAP_TYPE #undef BPF_MAP_TYPE
#undef BPF_LINK_TYPE #undef BPF_LINK_TYPE
#ifdef CONFIG_PROC_FS
static void bpf_link_show_fdinfo(struct seq_file *m, struct file *filp) static void bpf_link_show_fdinfo(struct seq_file *m, struct file *filp)
{ {
const struct bpf_link *link = filp->private_data; const struct bpf_link *link = filp->private_data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment