提交 55d7e99d 编写于 作者: W Wang Hai 提交者: Zheng Zengkai

libbpf: Simplify the return expression of bpf_object__init_maps function

mainline inclusion
from mainline-5.14-rc1
commit 3b3af91c
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5EUVD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3b3af91cb6893967bbec30f5c14562d0f7f00c2a

-------------------------------------------------

There is no need for special treatment of the 'ret == 0' case.
This patch simplifies the return expression.
Signed-off-by: NWang Hai <wanghai38@huawei.com>
Signed-off-by: NAndrii Nakryiko <andrii@kernel.org>
Acked-by: NYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210609115651.3392580-1-wanghai38@huawei.com
(cherry picked from commit 3b3af91c)
Signed-off-by: NWang Yufen <wangyufen@huawei.com>
上级 eb1c6c21
...@@ -2465,10 +2465,8 @@ static int bpf_object__init_maps(struct bpf_object *obj, ...@@ -2465,10 +2465,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_global_data_maps(obj);
err = err ?: bpf_object__init_kconfig_map(obj); err = err ?: bpf_object__init_kconfig_map(obj);
err = err ?: bpf_object__init_struct_ops_maps(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) static bool section_have_execinstr(struct bpf_object *obj, int idx)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册