2020-01-17 04:49:31

by Yue Haibing

Subject: [PATCH bpf-next] bpf: Remove set but not used variable 'first_key'

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 <[email protected]>
Signed-off-by: YueHaibing <[email protected]>
---
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

2020-01-17 04:50:30

by Brian Vazquez

Subject: Re: [PATCH bpf-next] bpf: Remove set but not used variable 'first_key'

On Thu, Jan 16, 2020 at 5:38 PM YueHaibing <[email protected]> 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 <[email protected]>

>
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: YueHaibing <[email protected]>
> ---
> 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
>
>

2020-01-17 05:34:48

by Alexei Starovoitov

Subject: Re: [PATCH bpf-next] bpf: Remove set but not used variable 'first_key'

On Thu, Jan 16, 2020 at 5:41 PM Brian Vazquez <[email protected]> wrote:
>
> On Thu, Jan 16, 2020 at 5:38 PM YueHaibing <[email protected]> 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 <[email protected]>

Applied. Thanks