2023-08-02 01:39:15

by Li kunyu

Subject: [PATCH] bpf: bpf_struct_ops: Remove unnecessa ry ‘0’ values from err

err is assigned first, so it does not need to initialize the assignment.

Signed-off-by: Li kunyu <[email protected]>
---
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;
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);
--
2.18.2

2023-08-03 02:24:51

by Martin KaFai Lau

Subject: Re: [PATCH] bpf: bpf_struct_ops: Remove unn ecessary ‘0’ values from err

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 <[email protected]>
> ---
> 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);