On Tue, Apr 25, 2023 at 01:33:54PM +0800, Yang Xu wrote: > Newer glibc such as glibc 2.36 also defines 'struct mount_attr' > in addition to <linux/mount.h>(we also include this kernel header when using > global.h). > > Usually we should use glibc header instead of kernel header. > But now mount.h is a special case because both new glibc header and > kernel header all define "struct mount_attr'. They also define MS* > macro. > > Since we have some syscall wrapper in vfs/missing.h, we can use > <linux.mount.h> directly instead of <sys/mount.h>. > > In fact, newer glibc(2.37-1)[1] has sloved conflict problem between > <sys/mount.h> and <linux/mount.h>. In the future(maybe ten years), > we can remove this kernel header and use glibc header. > > [1]https://sourceware.org/git/?p=glibc.git;a=commit;h=774058d72942249f71d74e7f2b639f77184160a6 > > Signed-off-by: Yang Xu <xuyang2018.jy@xxxxxxxxxxx> > --- There are neither enough drugs nor curses to express how enraging this header mess is. I've given up trying to understand what the "correct" solution is. So if this thing below works, Acked-by: Christian Brauner <brauner@xxxxxxxxxx> > src/detached_mounts_propagation.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/src/detached_mounts_propagation.c b/src/detached_mounts_propagation.c > index 17db2c02..dd11f7be 100644 > --- a/src/detached_mounts_propagation.c > +++ b/src/detached_mounts_propagation.c > @@ -20,7 +20,6 @@ > #include <stdio.h> > #include <stdlib.h> > #include <string.h> > -#include <sys/mount.h> > #include <sys/stat.h> > #include <sys/syscall.h> > #include <sys/types.h> > @@ -127,7 +126,7 @@ int main(int argc, char *argv[]) > if (ret < 0) > exit_log("%m - Failed to create new mount namespace"); > > - ret = mount(NULL, base_dir, NULL, MS_REC | MS_SHARED, NULL); > + ret = sys_mount(NULL, base_dir, NULL, MS_REC | MS_SHARED, NULL); > if (ret < 0) > exit_log("%m - Failed to make base_dir shared mountpoint"); > > @@ -174,7 +173,7 @@ int main(int argc, char *argv[]) > } > close(fd_tree); > > - ret = umount2(target, MNT_DETACH); > + ret = sys_umount2(target, MNT_DETACH); > if (ret < 0) { > fprintf(stderr, "%m - Failed to unmount %s", target); > exit_code = EXIT_FAILURE; > -- > 2.39.1 >
