2018-07-17 08:39:58

by Colin King

Subject: [PATCH] bpf: sockmap: remove redundant pointer sg

From: Colin Ian King <[email protected]>

Pointer sg is being assigned but is never used hence it is
redundant and can be removed.

Cleans up clang warning:
warning: variable 'sg' set but not used [-Wunused-but-set-variable]

Signed-off-by: Colin Ian King <[email protected]>
---
kernel/bpf/sockmap.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c
index 98fb7938beea..0b38be5a955c 100644
--- a/kernel/bpf/sockmap.c
+++ b/kernel/bpf/sockmap.c
@@ -725,11 +725,8 @@ static int bpf_tcp_sendmsg_do_redirect(struct sock *sk, int send,
{
bool ingress = !!(md->flags & BPF_F_INGRESS);
struct smap_psock *psock;
- struct scatterlist *sg;
int err = 0;

- sg = md->sg_data;
-
rcu_read_lock();
psock = smap_psock_sk(sk);
if (unlikely(!psock))
--
2.17.1

2018-07-18 13:09:18

by Daniel Borkmann

Subject: Re: [PATCH] bpf: sockmap: remove redundant pointer sg

On 07/17/2018 10:38 AM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Pointer sg is being assigned but is never used hence it is
> redundant and can be removed.
>
> Cleans up clang warning:
> warning: variable 'sg' set but not used [-Wunused-but-set-variable]
>
> Signed-off-by: Colin Ian King <[email protected]>

Applied to bpf-next, thanks Colin!