[PATCH 5.4 146/147] selftest/bpf: fix backported test_select_reuseport selftest changes

From: Greg Kroah-Hartman
Date: Mon May 18 2020 - 14:15:38 EST


From: Andrii Nakryiko <andriin@xxxxxx>

Fix up RET_IF as CHECK macro to make selftests compile again.

Fixes: b911c5e8686a ("selftests: bpf: Reset global state between reuseport test runs")
Signed-off-by: Andrii Nakryiko <andriin@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
tools/testing/selftests/bpf/test_select_reuseport.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/tools/testing/selftests/bpf/test_select_reuseport.c
+++ b/tools/testing/selftests/bpf/test_select_reuseport.c
@@ -668,12 +668,12 @@ static void cleanup_per_test(void)

for (i = 0; i < NR_RESULTS; i++) {
err = bpf_map_update_elem(result_map, &i, &zero, BPF_ANY);
- RET_IF(err, "reset elem in result_map",
+ CHECK(err, "reset elem in result_map",
"i:%u err:%d errno:%d\n", i, err, errno);
}

err = bpf_map_update_elem(linum_map, &zero, &zero, BPF_ANY);
- RET_IF(err, "reset line number in linum_map", "err:%d errno:%d\n",
+ CHECK(err, "reset line number in linum_map", "err:%d errno:%d\n",
err, errno);

for (i = 0; i < REUSEPORT_ARRAY_SIZE; i++)