diff options
| author | Hu Yadi <[email protected]> | 2024-01-24 10:29:08 +0800 |
|---|---|---|
| committer | Mickaël Salaün <[email protected]> | 2024-01-25 16:49:08 +0100 |
| commit | 40b7835e74e0383be308d528c5e0e41b3bf72ade (patch) | |
| tree | ca2fbd31593854c13df8dc42878cb9dcc53e337e | |
| parent | 116099ed345c932a8ae4a0d884a8f6cc54fd5fed (diff) | |
selftests/landlock: Fix fs_test build with old libc
One issue comes up while building selftest/landlock/fs_test on my side
(gcc 7.3/glibc-2.28/kernel-4.19).
gcc -Wall -O2 -isystem fs_test.c -lcap -o selftests/landlock/fs_test
fs_test.c:4575:9: error: initializer element is not constant
.mnt = mnt_tmp,
^~~~~~~
Signed-off-by: Hu Yadi <[email protected]>
Suggested-by: Jiao <[email protected]>
Reviewed-by: Berlin <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Fixes: 04f9070e99a4 ("selftests/landlock: Add tests for pseudo filesystems")
[mic: Factor out mount's data string and make mnt_tmp static]
Signed-off-by: Mickaël Salaün <[email protected]>
| -rw-r--r-- | tools/testing/selftests/landlock/fs_test.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c index 50818904397c..2d6d9b43d958 100644 --- a/tools/testing/selftests/landlock/fs_test.c +++ b/tools/testing/selftests/landlock/fs_test.c @@ -241,9 +241,11 @@ struct mnt_opt { const char *const data; }; -const struct mnt_opt mnt_tmp = { +#define MNT_TMP_DATA "size=4m,mode=700" + +static const struct mnt_opt mnt_tmp = { .type = "tmpfs", - .data = "size=4m,mode=700", + .data = MNT_TMP_DATA, }; static int mount_opt(const struct mnt_opt *const mnt, const char *const target) @@ -4632,7 +4634,10 @@ FIXTURE_VARIANT(layout3_fs) /* clang-format off */ FIXTURE_VARIANT_ADD(layout3_fs, tmpfs) { /* clang-format on */ - .mnt = mnt_tmp, + .mnt = { + .type = "tmpfs", + .data = MNT_TMP_DATA, + }, .file_path = file1_s1d1, }; |