tools/nolibc: move mount() to sys/mount.h

This is the location regular userspace expects this definition.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250515-nolibc-sys-v1-2-74f82eea3b59@weissschuh.net

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index 54dccb23f1b314b36ceef3bc60a2bcd447f612a3..6129761f423a8e7805689fba6bcfd41963d3f3a1 100644 (file)
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -51,6 +51,7 @@ all_files := \
                sys/auxv.h \
                sys/ioctl.h \
                sys/mman.h \
+               sys/mount.h \
                sys/random.h \
                sys/stat.h \
                sys/syscall.h \

diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index d6048d1e9ea5d4b5d504e156aafc5651dcd6b8c1..690368f8e46c33df37c824429cf89dd0e95bb806 100644 (file)
--- a/tools/include/nolibc/nolibc.h
+++ b/tools/include/nolibc/nolibc.h
@@ -99,6 +99,7 @@
 #include "sys/auxv.h"
 #include "sys/ioctl.h"
 #include "sys/mman.h"
+#include "sys/mount.h"
 #include "sys/random.h"
 #include "sys/stat.h"
 #include "sys/syscall.h"

diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
index 313c210173c804f728b0be4ab8e67542bb3a7219..e66dd6e760557333353d98da2627b038dffe7f93 100644 (file)
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -672,26 +672,6 @@ int mknod(const char *path, mode_t mode, dev_t dev)
        return __sysret(sys_mknod(path, mode, dev));
 }
 
-/*
- * int mount(const char *source, const char *target,
- *           const char *fstype, unsigned long flags,
- *           const void *data);
- */
-static __attribute__((unused))
-int sys_mount(const char *src, const char *tgt, const char *fst,
-                     unsigned long flags, const void *data)
-{
-       return my_syscall5(__NR_mount, src, tgt, fst, flags, data);
-}
-
-static __attribute__((unused))
-int mount(const char *src, const char *tgt,
-          const char *fst, unsigned long flags,
-          const void *data)
-{
-       return __sysret(sys_mount(src, tgt, fst, flags, data));
-}
-
 
 /*
  * int pipe2(int pipefd[2], int flags);

diff --git a/tools/include/nolibc/sys/mount.h b/tools/include/nolibc/sys/mount.h
new file mode 100644 (file)
index 0000000..e39ec02
--- /dev/null
+++ b/tools/include/nolibc/sys/mount.h
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
+/*
+ * Mount definitions for NOLIBC
+ * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
+ */
+
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
+#ifndef _NOLIBC_SYS_MOUNT_H
+#define _NOLIBC_SYS_MOUNT_H
+
+#include "../sys.h"
+
+#include <linux/mount.h>
+
+/*
+ * int mount(const char *source, const char *target,
+ *           const char *fstype, unsigned long flags,
+ *           const void *data);
+ */
+static __attribute__((unused))
+int sys_mount(const char *src, const char *tgt, const char *fst,
+             unsigned long flags, const void *data)
+{
+       return my_syscall5(__NR_mount, src, tgt, fst, flags, data);
+}
+
+static __attribute__((unused))
+int mount(const char *src, const char *tgt,
+         const char *fst, unsigned long flags,
+         const void *data)
+{
+       return __sysret(sys_mount(src, tgt, fst, flags, data));
+}
+
+#endif /* _NOLIBC_SYS_MOUNT_H */