Skip to content

Commit 40b7835

Browse files
Hu Yadil0kod
authored andcommitted
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 <hu.yadi@h3c.com> Suggested-by: Jiao <jiaoxupo@h3c.com> Reviewed-by: Berlin <berlin@h3c.com> Link: https://lore.kernel.org/r/20240124022908.42100-1-hu.yadi@h3c.com Fixes: 04f9070 ("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 <mic@digikod.net>
1 parent 116099e commit 40b7835

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

tools/testing/selftests/landlock/fs_test.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,11 @@ struct mnt_opt {
241241
const char *const data;
242242
};
243243

244-
const struct mnt_opt mnt_tmp = {
244+
#define MNT_TMP_DATA "size=4m,mode=700"
245+
246+
static const struct mnt_opt mnt_tmp = {
245247
.type = "tmpfs",
246-
.data = "size=4m,mode=700",
248+
.data = MNT_TMP_DATA,
247249
};
248250

249251
static int mount_opt(const struct mnt_opt *const mnt, const char *const target)
@@ -4632,7 +4634,10 @@ FIXTURE_VARIANT(layout3_fs)
46324634
/* clang-format off */
46334635
FIXTURE_VARIANT_ADD(layout3_fs, tmpfs) {
46344636
/* clang-format on */
4635-
.mnt = mnt_tmp,
4637+
.mnt = {
4638+
.type = "tmpfs",
4639+
.data = MNT_TMP_DATA,
4640+
},
46364641
.file_path = file1_s1d1,
46374642
};
46384643

0 commit comments

Comments
 (0)