diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /filesystems/mergerfs/files/patch-tools_preload.c | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'filesystems/mergerfs/files/patch-tools_preload.c')
| -rw-r--r-- | filesystems/mergerfs/files/patch-tools_preload.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/filesystems/mergerfs/files/patch-tools_preload.c b/filesystems/mergerfs/files/patch-tools_preload.c index a9a3ad06b3c3..28580071c50d 100644 --- a/filesystems/mergerfs/files/patch-tools_preload.c +++ b/filesystems/mergerfs/files/patch-tools_preload.c @@ -1,29 +1,14 @@ ---- tools/preload.c.orig 2024-02-29 20:41:22 UTC +--- tools/preload.c.orig 2025-11-18 14:35:27 UTC +++ tools/preload.c -@@ -25,10 +25,25 @@ - #include <string.h> +@@ -33,7 +33,11 @@ #include <sys/ioctl.h> - #include <stdarg.h> --#include <sys/stat.h> -+#include <sys/stat.h> -+#ifdef __linux__ -+#define S_IFMT S_IFMT -+#define S_IFREG S_IFREG -+#else -+#define S_IFMT 0 -+#define S_IFREG 0 -+#endif + #include <sys/stat.h> #include <sys/types.h> - #include <unistd.h> - #include <fcntl.h> -+ -+#ifdef __linux__ -+#define O_TMPFILE O_TMPFILE -+#define O_PATH O_PATH ++#ifdef __FreeBSD__ ++#include <sys/extattr.h> +#else -+#define O_TMPFILE 0 -+#define O_PATH 0 + #include <sys/xattr.h> +#endif + #include <unistd.h> typedef char IOCTL_BUF[4096]; - #define IOCTL_APP_TYPE 0xDF |