Re: [PATCH] selftests/bpf: Remove unused variable

[Yonghong Song]

On 11/18/24 1:34 AM, Zhu Jun wrote:
> the variable is never referenced in the code, just remove them.
>
> Signed-off-by: Zhu Jun <zhujun2@xxxxxxxxxxxxxxxxxxxx>
> ---
>   tools/testing/selftests/bpf/prog_tests/log_buf.c | 2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/log_buf.c b/tools/testing/selftests/bpf/prog_tests/log_buf.c
> index 27676a04d0b6..5d1678b15d8b 100644
> --- a/tools/testing/selftests/bpf/prog_tests/log_buf.c
> +++ b/tools/testing/selftests/bpf/prog_tests/log_buf.c
> @@ -191,7 +191,6 @@ static void bpf_prog_load_log_buf(void)
>   	ASSERT_LT(fd, 0, "bad_fd");
>   	if (fd >= 0)
>   		close(fd);
> -	fd = -1;
>   
>   	free(log_buf);
>   }

This patch failed to apply to latest bpf-next.
  $ git apply ~/p1.txt
  error: patch failed: tools/testing/selftests/bpf/prog_tests/log_buf.c:191
  error: tools/testing/selftests/bpf/prog_tests/log_buf.c: patch does not apply

The reason is the above 'fd = -1' already gone:

188         ASSERT_OK_PTR(strstr(log_buf, "R0 !read_ok"), "bad_log_0");
189         ASSERT_LT(fd, 0, "bad_fd");
190         if (fd >= 0)
191                 close(fd);
192
193         free(log_buf);
194 }

> @@ -259,7 +258,6 @@ static void bpf_btf_load_log_buf(void)
>   	ASSERT_LT(fd, 0, "bad_fd");
>   	if (fd >= 0)
>   		close(fd);
> -	fd = -1;
>   
>   cleanup:
>   	free(log_buf);

There are more redundant 'fd = -1' in function bpf_btf_load_log_buf(),
you may want to remove them as well.