2021-06-09 15:00:19

by Wang Hai

Subject: [PATCH bpf-next] libbpf: simplify the return expression of bpf_object__init_maps function

There is no need for special treatment of the 'ret == 0' case.
This patch simplifies the return expression.

Signed-off-by: Wang Hai <[email protected]>
---
tools/lib/bpf/libbpf.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index c41d9b2b59ac..e49fcac45fdc 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -2425,10 +2425,8 @@ static int bpf_object__init_maps(struct bpf_object *obj,
err = err ?: bpf_object__init_global_data_maps(obj);
err = err ?: bpf_object__init_kconfig_map(obj);
err = err ?: bpf_object__init_struct_ops_maps(obj);
- if (err)
- return err;

- return 0;
+ return err;
}

static bool section_have_execinstr(struct bpf_object *obj, int idx)
--
2.17.1

2021-06-09 16:19:03

by Yonghong Song

Subject: Re: [PATCH bpf-next] libbpf: simplify the return expression of bpf_object__init_maps function

On 6/9/21 4:56 AM, Wang Hai wrote:
> There is no need for special treatment of the 'ret == 0' case.
> This patch simplifies the return expression.
>
> Signed-off-by: Wang Hai <[email protected]>

Acked-by: Yonghong Song <[email protected]>

2021-06-15 06:26:04

by Andrii Nakryiko

Subject: Re: [PATCH bpf-next] libbpf: simplify the return expression of bpf_object__init_maps function

On Wed, Jun 9, 2021 at 8:21 AM Yonghong Song <[email protected]> wrote:
>
>
>
> On 6/9/21 4:56 AM, Wang Hai wrote:
> > There is no need for special treatment of the 'ret == 0' case.
> > This patch simplifies the return expression.
> >
> > Signed-off-by: Wang Hai <[email protected]>
>
> Acked-by: Yonghong Song <[email protected]>

Applied to bpf-next a few days ago. Seems like patchbot was off duty
at that time.