Fix MS_LAZYTIME not defined on uclibc and move all MS_* and UMOUNT_* (#753)

as well as <sys/mount.h> inclusion to new fuse_mount_compat.h file.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

diff --git a/include/fuse_mount_compat.h b/include/fuse_mount_compat.h
new file mode 100644 (file)
index 0000000..0142b51
--- /dev/null
+++ b/include/fuse_mount_compat.h
@@ -0,0 +1,42 @@
+/*
+  FUSE: Filesystem in Userspace
+  Copyright (C) 2023 Giulio Benetti <giulio.benetti@benettiengineering.com>
+
+  Logging API.
+
+  This program can be distributed under the terms of the GNU LGPLv2.
+  See the file LICENSE
+*/
+
+#ifndef FUSE_MOUNT_COMPAT_H_
+#define FUSE_MOUNT_COMPAT_H_
+
+#include <sys/mount.h>
+
+/* Some libc don't define MS_*, so define them manually
+ * (values taken from https://elixir.bootlin.com/linux/v4.0.9/source/include/uapi/linux/fs.h#L68 on)
+ */
+#ifndef MS_DIRSYNC
+#define MS_DIRSYNC     128
+#endif
+#ifndef MS_REC
+#define MS_REC         16384
+#endif
+#ifndef MS_PRIVATE
+#define MS_PRIVATE     (1<<18)
+#endif
+#ifndef MS_LAZYTIME
+#define MS_LAZYTIME    (1<<25)
+#endif
+
+#ifndef UMOUNT_DETACH
+#define UMOUNT_DETACH  0x00000002      /* Just detach from the tree */
+#endif
+#ifndef UMOUNT_NOFOLLOW
+#define UMOUNT_NOFOLLOW        0x00000008      /* Don't follow symlink on umount */
+#endif
+#ifndef UMOUNT_UNUSED
+#define UMOUNT_UNUSED  0x80000000      /* Flag guaranteed to be unused */
+#endif
+
+#endif /* FUSE_MOUNT_COMPAT_H_ */

diff --git a/lib/mount.c b/lib/mount.c
index 1f1ee860d2a3908d2e8a7e601879b8f4567bb1ef..399024366578fedffe8343a9f69bd91ac4834576 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -25,7 +25,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-#include <sys/mount.h>
+
+#include "fuse_mount_compat.h"
 
 #ifdef __NetBSD__
 #include <perfuse.h>

diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c
index 35f363452c74136e08976cbde564f3eb908f4866..73abc67d70bf35fc424c5c721cc1b14555d0af24 100644 (file)
--- a/lib/mount_bsd.c
+++ b/lib/mount_bsd.c
@@ -14,7 +14,7 @@
 #include "fuse_opt.h"
 
 #include <sys/param.h>
-#include <sys/mount.h>
+#include "fuse_mount_compat.h"
 
 #include <sys/stat.h>
 #include <sys/wait.h>

diff --git a/lib/mount_util.c b/lib/mount_util.c
index daf7b5e7aa798374fed31fed36d8cdcaee53380c..8027a2e016005db6e19db87f6371b59e07bce000 100644 (file)
--- a/lib/mount_util.c
+++ b/lib/mount_util.c
@@ -10,6 +10,7 @@
 
 #include "fuse_config.h"
 #include "mount_util.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -27,7 +28,9 @@
 #endif
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <sys/mount.h>
+
+#include "fuse_mount_compat.h"
+
 #include <sys/param.h>
 
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)

diff --git a/util/fusermount.c b/util/fusermount.c
index 7a6bc24f8288da7543c35f0fed3bdd185db8722f..850cf6b2a78900466177ac2e0b833f81a2c06032 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -24,7 +24,9 @@
 #include <mntent.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/mount.h>
+
+#include "fuse_mount_compat.h"
+
 #include <sys/fsuid.h>
 #include <sys/socket.h>
 #include <sys/utsname.h>
@@ -36,26 +38,6 @@
 
 #define FUSE_DEV "/dev/fuse"
 
-#ifndef MS_DIRSYNC
-#define MS_DIRSYNC 128
-#endif
-#ifndef MS_REC
-#define MS_REC 16384
-#endif
-#ifndef MS_PRIVATE
-#define MS_PRIVATE (1<<18)
-#endif
-
-#ifndef UMOUNT_DETACH
-#define UMOUNT_DETACH  0x00000002      /* Just detach from the tree */
-#endif
-#ifndef UMOUNT_NOFOLLOW
-#define UMOUNT_NOFOLLOW        0x00000008      /* Don't follow symlink on umount */
-#endif
-#ifndef UMOUNT_UNUSED
-#define UMOUNT_UNUSED  0x80000000      /* Flag guaranteed to be unused */
-#endif
-
 static const char *progname;
 
 static int user_allow_other = 0;