* Re: [PATCH v8 2/9] selftests/landlock: Locally define __maybe_unused
[not found] ` <20221001154908.49665-3-gnoack3000@gmail.com>
@ 2022-10-05 18:53 ` Mickaël Salaün
2022-10-08 7:47 ` Günther Noack
0 siblings, 1 reply; 2+ messages in thread
From: Mickaël Salaün @ 2022-10-05 18:53 UTC (permalink / raw)
To: Günther Noack, linux-security-module
Cc: James Morris, Paul Moore, Serge E . Hallyn, linux-fsdevel,
Konstantin Meskhidze, linux-kselftest, Shuah Khan
Thanks for cleaning this. Can you please move this patch just before the
test patches?
On 01/10/2022 17:49, Günther Noack wrote:
> The checkpatch tool started to flag __attribute__(__unused__), which
> we previously used. The header where this is normally defined is not
> currently compatible with selftests.
>
> This is the same approach as used in selftests/net/psock_lib.h.
>
> Signed-off-by: Günther Noack <gnoack3000@gmail.com>
> ---
> tools/testing/selftests/landlock/common.h | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/tools/testing/selftests/landlock/common.h b/tools/testing/selftests/landlock/common.h
> index 7ba18eb23783..7d34592471db 100644
> --- a/tools/testing/selftests/landlock/common.h
> +++ b/tools/testing/selftests/landlock/common.h
> @@ -17,6 +17,10 @@
>
> #include "../kselftest_harness.h"
>
> +#ifndef __maybe_unused
> +#define __maybe_unused __attribute__((__unused__))
> +#endif
> +
> /*
> * TEST_F_FORK() is useful when a test drop privileges but the corresponding
> * FIXTURE_TEARDOWN() requires them (e.g. to remove files from a directory
> @@ -140,14 +144,12 @@ static void _init_caps(struct __test_metadata *const _metadata, bool drop_all)
> }
>
> /* We cannot put such helpers in a library because of kselftest_harness.h . */
> -__attribute__((__unused__)) static void
> -disable_caps(struct __test_metadata *const _metadata)
> +static void __maybe_unused disable_caps(struct __test_metadata *const _metadata)
> {
> _init_caps(_metadata, false);
> }
>
> -__attribute__((__unused__)) static void
> -drop_caps(struct __test_metadata *const _metadata)
> +static void __maybe_unused drop_caps(struct __test_metadata *const _metadata)
> {
> _init_caps(_metadata, true);
> }
> @@ -176,14 +178,14 @@ static void _effective_cap(struct __test_metadata *const _metadata,
> }
> }
>
> -__attribute__((__unused__)) static void
> -set_cap(struct __test_metadata *const _metadata, const cap_value_t caps)
> +static void __maybe_unused set_cap(struct __test_metadata *const _metadata,
> + const cap_value_t caps)
> {
> _effective_cap(_metadata, caps, CAP_SET);
> }
>
> -__attribute__((__unused__)) static void
> -clear_cap(struct __test_metadata *const _metadata, const cap_value_t caps)
> +static void __maybe_unused clear_cap(struct __test_metadata *const _metadata,
> + const cap_value_t caps)
> {
> _effective_cap(_metadata, caps, CAP_CLEAR);
> }
^ permalink raw reply [flat|nested] 2+ messages in thread