Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200429132217.1294289-1-arnd@arndb.de>
In-Reply-To: <20200429132217.1294289-1-arnd@arndb.de>
From:   Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date:   Wed, 29 Apr 2020 13:36:17 -0700
Message-ID: <CAEf4Bzahz15mGQC21Hr9dfCE6uDrgWvARr2_0f0i592keW3orQ@mail.gmail.com>
Subject: Re: [PATCH] bpf: fix unused variable warning
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andriin@fb.com>,
        Martin KaFai Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
        Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, Apr 29, 2020 at 6:23 AM Arnd Bergmann <arnd@arndb.de> wrote:
>
> 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: f2e10bff16a0 ("bpf: Add support for BPF_OBJ_GET_INFO_BY_FD for bpf_link")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

Thanks for the fix, LGTM.

Acked-by: Andrii Nakryiko <andriin@fb.com>

>  kernel/bpf/syscall.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 3cea7602de78..5e86d8749e6e 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -2274,6 +2274,7 @@ static int bpf_link_release(struct inode *inode, struct file *filp)
>         return 0;
>  }
>
> +#ifdef CONFIG_PROC_FS
>  #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
>  #define BPF_MAP_TYPE(_id, _ops)
>  #define BPF_LINK_TYPE(_id, _name) [_id] = #_name,
> @@ -2285,7 +2286,6 @@ static const char *bpf_link_type_strs[] = {
>  #undef BPF_MAP_TYPE
>  #undef BPF_LINK_TYPE
>
> -#ifdef CONFIG_PROC_FS
>  static void bpf_link_show_fdinfo(struct seq_file *m, struct file *filp)
>  {
>         const struct bpf_link *link = filp->private_data;
> --
> 2.26.0
>