* [PATCH bpf-next] bpf: Remove set but not used variable 'first_key'
@ 2020-01-16 14:53 YueHaibing
2020-01-17 1:41 ` Brian Vazquez
0 siblings, 1 reply; 3+ messages in thread
From: YueHaibing @ 2020-01-16 14:53 UTC (permalink / raw)
To: ast, daniel, kafai, songliubraving, yhs, andriin, brianvv
Cc: netdev, bpf, linux-kernel, YueHaibing
kernel/bpf/syscall.c: In function generic_map_lookup_batch:
kernel/bpf/syscall.c:1339:7: warning: variable first_key set but not used [-Wunused-but-set-variable]
It is never used, so remove it.
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
kernel/bpf/syscall.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 0d94d36..c26a714 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1336,7 +1336,6 @@ int generic_map_lookup_batch(struct bpf_map *map,
void *buf, *buf_prevkey, *prev_key, *key, *value;
int err, retry = MAP_LOOKUP_RETRIES;
u32 value_size, cp, max_count;
- bool first_key = false;
if (attr->batch.elem_flags & ~BPF_F_LOCK)
return -EINVAL;
@@ -1365,7 +1364,6 @@ int generic_map_lookup_batch(struct bpf_map *map,
}
err = -EFAULT;
- first_key = false;
prev_key = NULL;
if (ubatch && copy_from_user(buf_prevkey, ubatch, map->key_size))
goto free_buf;
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: Remove set but not used variable 'first_key'
2020-01-16 14:53 [PATCH bpf-next] bpf: Remove set but not used variable 'first_key' YueHaibing
@ 2020-01-17 1:41 ` Brian Vazquez
2020-01-17 4:19 ` Alexei Starovoitov
0 siblings, 1 reply; 3+ messages in thread
From: Brian Vazquez @ 2020-01-17 1:41 UTC (permalink / raw)
To: YueHaibing
Cc: Alexei Starovoitov, Daniel Borkmann, kafai, songliubraving,
Yonghong Song, andriin, Linux NetDev, bpf, open list
On Thu, Jan 16, 2020 at 5:38 PM YueHaibing <yuehaibing@huawei.com> wrote:
>
> kernel/bpf/syscall.c: In function generic_map_lookup_batch:
> kernel/bpf/syscall.c:1339:7: warning: variable first_key set but not used [-Wunused-but-set-variable]
>
> It is never used, so remove it.
Previous logic was using it but I forgot to delete it. Thanks for fixing it!
Acked-by: Brian Vazquez <brianvv@google.com>
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> kernel/bpf/syscall.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 0d94d36..c26a714 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -1336,7 +1336,6 @@ int generic_map_lookup_batch(struct bpf_map *map,
> void *buf, *buf_prevkey, *prev_key, *key, *value;
> int err, retry = MAP_LOOKUP_RETRIES;
> u32 value_size, cp, max_count;
> - bool first_key = false;
>
> if (attr->batch.elem_flags & ~BPF_F_LOCK)
> return -EINVAL;
> @@ -1365,7 +1364,6 @@ int generic_map_lookup_batch(struct bpf_map *map,
> }
>
> err = -EFAULT;
> - first_key = false;
> prev_key = NULL;
> if (ubatch && copy_from_user(buf_prevkey, ubatch, map->key_size))
> goto free_buf;
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: Remove set but not used variable 'first_key'
2020-01-17 1:41 ` Brian Vazquez
@ 2020-01-17 4:19 ` Alexei Starovoitov
0 siblings, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2020-01-17 4:19 UTC (permalink / raw)
To: Brian Vazquez
Cc: YueHaibing, Alexei Starovoitov, Daniel Borkmann,
Martin KaFai Lau, Song Liu, Yonghong Song, Andrii Nakryiko,
Linux NetDev, bpf, open list
On Thu, Jan 16, 2020 at 5:41 PM Brian Vazquez <brianvv@google.com> wrote:
>
> On Thu, Jan 16, 2020 at 5:38 PM YueHaibing <yuehaibing@huawei.com> wrote:
> >
> > kernel/bpf/syscall.c: In function generic_map_lookup_batch:
> > kernel/bpf/syscall.c:1339:7: warning: variable first_key set but not used [-Wunused-but-set-variable]
> >
> > It is never used, so remove it.
>
> Previous logic was using it but I forgot to delete it. Thanks for fixing it!
>
> Acked-by: Brian Vazquez <brianvv@google.com>
Applied. Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-17 4:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-16 14:53 [PATCH bpf-next] bpf: Remove set but not used variable 'first_key' YueHaibing
2020-01-17 1:41 ` Brian Vazquez
2020-01-17 4:19 ` Alexei Starovoitov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).