sys-fs/zfs: Cherry-pick musl S_IFMT patch from upstream for 2.3.2

Closes: https://bugs.gentoo.org/956272
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Part-of: https://github.com/gentoo/gentoo/pull/42121
Closes: https://github.com/gentoo/gentoo/pull/42121
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Haelwenn (lanodan) Monnier
2025-05-16 21:41:17 +02:00
committed by Sam James
parent 15a06e81dc
commit 56c2f0ed24
2 changed files with 41 additions and 0 deletions

View File

@@ -0,0 +1,40 @@
https://github.com/openzfs/zfs/pull/17294 (merged)
From 634c172ee89f5303493a75dc7ff55e0a355b503a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?=
<salvador.joseluis@gmail.com>
Date: Fri, 2 May 2025 23:49:25 +0200
Subject: [PATCH] tests: fix `S_IFMT` undeclared at `statx.c`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
`S_IFMT` is declared in `sys/stat.h`, but we cannot include this header
because it redeclares the `statx` function with different argument
types. Therefore, we define `S_IFMT` ourselves, in the same way as the
other definitions.
Reviewed-by: Rob Norris <robn@despairlabs.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
Closes #17293
Closes #17294
---
tests/zfs-tests/cmd/statx.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/zfs-tests/cmd/statx.c b/tests/zfs-tests/cmd/statx.c
index 89939f6efb40..1acc7e58c5ce 100644
--- a/tests/zfs-tests/cmd/statx.c
+++ b/tests/zfs-tests/cmd/statx.c
@@ -109,6 +109,9 @@ _statx(int fd, const char *path, int flags, unsigned int mask, void *stx)
#ifndef STATX_DIOALIGN
#define STATX_DIOALIGN (1<<13)
#endif
+#ifndef S_IFMT
+#define S_IFMT 0170000
+#endif
typedef struct {
int64_t tv_sec;

View File

@@ -111,6 +111,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
"${FILESDIR}"/2.3.2-musl_S_IFMT.patch
)
pkg_pretend() {