selftests/overlayfs: fix compilation error in overlayfs
PATCH RESEND 1/1 selftests/overlayfs: fix compilation error in overlayfs
make -C tools/testing/selftests, compiling dev_in_maps fail.
In file included from dev_in_maps.c:10:/usr/include/x86_64-linux-gnu/sys/mount.h:35:3: error: expected identifier before numeric constant
35 | MS_RDONLY = 1, /* Mount read-only. */
| ^~~~~~~~~That sys/mount.h has to be included before linux/mount.h.
--- tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c +1 -1
@@ -7,11 +7,11 @@#include <linux/unistd.h> #include <linux/types.h> -#include <linux/mount.h> #include <sys/syscall.h> #include <sys/stat.h> #include <sys/mount.h> #include <sys/mman.h> +#include <linux/mount.h> #include <sched.h> #include <fcntl.h>
Signature · 1 line
2.34.1
Shuah Khan
maintainerQuoted 6 lines · Meng Li
make -C
tools/testing/selftests, compilingdev_in_mapsfail.
In file included from dev_in_maps.c:10:/usr/include/x86_64-linux-gnu/sys/mount.h:35:3: error: expected identifier before numeric constant35 | MS_RDONLY = 1, /* Mount read-only. */ | ^~~~~~~~~
Quoted 7 lines
That
sys/mount.hhas to be included beforelinux/mount.h.Signed-off-by Meng Li <[email protected]>--- tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
I don't see this problem when I build it on my system when I run:
make -C tools/testing/selftests
or
make -C tools/testing/selftests/filesystems/overlayfs
Are you running this after doing headers_install?
thanks,
-- Shuah
Quoted 16 lines · Shuah Khan
Quoted 6 lines · Meng Li
make -C
tools/testing/selftests, compilingdev_in_mapsfail.
In file included from dev_in_maps.c:10:/usr/include/x86_64-linux-gnu/sys/mount.h:35:3: error: expected identifier before numeric constant35 | MS_RDONLY = 1, /* Mount read-only. */ | ^~~~~~~~~Quoted 7 lines
That
sys/mount.hhas to be included beforelinux/mount.h.Signed-off-by Meng Li <[email protected]>--- tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 8 lines
I don't see this problem when I build it on my system when I run:
make -C
tools/testing/selftests
or
make -Ctools/testing/selftests/filesystems/overlayfsAre you running this after doing
headers_install?
It depends on libc headers. It can work with one libc and doesn't work with another one. I have seen many times when linux headers conflicted with libc headers. The only reliable way to avoid this sort of issues is to include just one linux or libc header.
In this case, we can do something like this:
(quoted diff) +0 -0
b/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c index e19ab0e85709..f1ba82e52192 100644
tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c +0 -1
@@ -10,7 +10,6 @@#include <linux/mount.h> #include <sys/syscall.h> #include <sys/stat.h> -#include <sys/mount.h> #include <sys/mman.h> #include <sched.h> #include <fcntl.h>
@@ -40,6 +39,14 @@ static int sys_move_mount(int from_dfd, const char
*from_pathname,
return syscall(__NR_move_mount, from_dfd, from_pathname,to_dfd, to_pathname, flags);
}
+static int sys_mount(const char *source, const char *target,
+ const char *filesystemtype, unsigned long mountflags,
+ const void *data)
+{
+ return syscall(__NR_mount, source, target, filesystemtype,
mountflags, data);
+}
+
+
static long get_file_dev_and_inode(void *addr, struct statx *stx)
{
char buf[4096];
@@ -167,7 +174,7 @@ int main(int argc, char **argv)
return 1;
}- if (mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL) == -1) {
+ if (sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL) == -1) {
pr_perror("mount");
return 1;
}Thanks,
Andrei
Shuah Khan
maintainerQuoted 66 lines · Andrei Vagin
Quoted 16 lines · Shuah Khan
Quoted 6 lines · Meng Li
make -C
tools/testing/selftests, compilingdev_in_mapsfail.
In file included from dev_in_maps.c:10:/usr/include/x86_64-linux-gnu/sys/mount.h:35:3: error: expected identifier before numeric constant35 | MS_RDONLY = 1, /* Mount read-only. */ | ^~~~~~~~~Quoted 7 lines
That
sys/mount.hhas to be included beforelinux/mount.h.Signed-off-by Meng Li <[email protected]>--- tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 8 lines
I don't see this problem when I build it on my system when I run:
make -C
tools/testing/selftests
or
make -Ctools/testing/selftests/filesystems/overlayfsAre you running this after doing
headers_install?It depends on libc headers. It can work with one libc and doesn't work with another one. I have seen many times when linux headers conflicted with libc headers. The only reliable way to avoid this sort of issues is to include just one linux or libc header.
In this case, we can do something like this:
tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c +8
-1@@ -10,7 +10,6 @@#include <linux/mount.h> #include <sys/syscall.h> #include <sys/stat.h> -#include <sys/mount.h> #include <sys/mman.h> #include <sched.h> #include <fcntl.h> @@ -40,6 +39,14 @@ static int sys_move_mount(int from_dfd, const char *from_pathname, return syscall(__NR_move_mount, from_dfd, from_pathname, to_dfd, to_pathname, flags); } +static int sys_mount (const char *source,const char *target, +const char *filesystemtype,unsigned long mountflags, +const void *data) +{ +return syscall (__NR_mount, source, target, filesystemtype, mountflags, data); +} + +static long get_file_dev_and_inode(void *addr, struct statx *stx) { char buf[4096];
tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c int main(int argc, char **argv) · line 180
Quoted 8 lines
tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c +1
-1@@ -167,7 +174,7 @@ int main(int argc, char **argv)return 1 ; } -if (mount (NULL ,"/" ,NULL ,MS_SLAVE |MS_REC ,NULL ) ==-1 ) { +if (sys_mount (NULL ,"/" ,NULL ,MS_SLAVE |MS_REC ,NULL ) ==-1 ) {pr_perror ("mount" );return 1 ; }
This is definitely better solution to this problem than reordering the includes only find another problem down the road.
thanks,
-- Shuah