Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <a3da80bc-644b-69d7-675c-6af2d29b7f5c@linux.dev>
Date:   Wed, 2 Aug 2023 17:51:35 -0700
MIME-Version: 1.0
Subject: =?UTF-8?Q?Re=3a_=5bPATCH=5d_bpf=3a_bpf=5fstruct=5fops=3a_Remove_unn?=
 =?UTF-8?Q?ecessary_=e2=80=980=e2=80=99_values_from_err?=
Content-Language: en-US
To:     Li kunyu <kunyu@nfschina.com>
Cc:     bpf@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net,
        andrii@kernel.org, song@kernel.org, yhs@fb.com,
        john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
        haoluo@google.com, jolsa@kernel.org
References: <20230802012354.7404-1-kunyu@nfschina.com>
From:   Martin KaFai Lau <martin.lau@linux.dev>
In-Reply-To: <20230802012354.7404-1-kunyu@nfschina.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 8/1/23 6:23 PM, Li kunyu wrote:
> err is assigned first, so it does not need to initialize the assignment.
> 
> Signed-off-by: Li kunyu <kunyu@nfschina.com>
> ---
>   kernel/bpf/bpf_struct_ops.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
> index d3f0a4825fa6..5b591fda5d62 100644
> --- a/kernel/bpf/bpf_struct_ops.c
> +++ b/kernel/bpf/bpf_struct_ops.c
> @@ -376,7 +376,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,
>   	const struct btf_type *t = st_ops->type;
>   	struct bpf_tramp_links *tlinks = NULL;
>   	void *udata, *kdata;
> -	int prog_fd, err = 0;
> +	int prog_fd, err;

The "tlinks" init in two lines above is also not needed. While at the same 
function, please take this chance to remove it together.

Please tag the subject with "bpf-next v2" in the next respin.

>   	void *image, *image_end;
>   	u32 i;
>   
> @@ -818,7 +818,7 @@ static int bpf_struct_ops_map_link_update(struct bpf_link *link, struct bpf_map
>   	struct bpf_struct_ops_map *st_map, *old_st_map;
>   	struct bpf_map *old_map;
>   	struct bpf_struct_ops_link *st_link;
> -	int err = 0;
> +	int err;
>   
>   	st_link = container_of(link, struct bpf_struct_ops_link, link);
>   	st_map = container_of(new_map, struct bpf_struct_ops_map, map);